Skip to content

Commit 0da192c

Browse files
baurmattbaurmatt
committed
remove-tea-module - Remove usage of tea module
This commit remove the usage of the tea module which was used for data type validation only. Most of the data types are already available with the stdlib module. Fixes voxpupuli#894
1 parent 1eb41d4 commit 0da192c

11 files changed

+50
-56
lines changed

‎.fixtures.yml

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ fixtures:
1818
apt:
1919
repo: puppetlabs/apt
2020
ref: 2.2.2
21-
tea:
22-
repo: puppet/tea
23-
ref: 0.2.0
2421
zypprepo:
2522
repo: darin/zypprepo
2623
ref: 1.0.2

‎CONTRIBUTORS

+1
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ Ian Bissett (bisscuitt)
2929
Fabian M. Krack (onibox)
3030
Rhommel Lamas (rhoml)
3131
Jose Luis Ledesma (sp-joseluis-ledesma)
32+
Matthias Baur (baurmatt)

‎manifests/index.pp

+11-11
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@
4343
# @author Tyler Langlois <[email protected]>
4444
#
4545
define elasticsearch::index (
46-
Enum['absent', 'present'] $ensure = 'present',
47-
Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password,
48-
Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username,
49-
Optional[Tea::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file,
50-
Optional[Tea::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path,
51-
String $api_host = $elasticsearch::api_host,
52-
Tea::Port $api_port = $elasticsearch::api_port,
53-
Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol,
54-
Integer $api_timeout = $elasticsearch::api_timeout,
55-
Hash $settings = {},
56-
Boolean $validate_tls = $elasticsearch::validate_tls,
46+
Enum['absent', 'present'] $ensure = 'present',
47+
Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password,
48+
Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username,
49+
Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file,
50+
Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path,
51+
String $api_host = $elasticsearch::api_host,
52+
Integer[0, 65535] $api_port = $elasticsearch::api_port,
53+
Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol,
54+
Integer $api_timeout = $elasticsearch::api_timeout,
55+
Hash $settings = {},
56+
Boolean $validate_tls = $elasticsearch::validate_tls,
5757
) {
5858

5959
es_instance_conn_validator { "${name}-index-conn-validator":

‎manifests/init.pp

+11-11
Original file line numberDiff line numberDiff line change
@@ -307,49 +307,49 @@
307307
Optional[String] $api_ca_file,
308308
Optional[String] $api_ca_path,
309309
String $api_host,
310-
Tea::Port $api_port,
310+
Integer[0, 65535] $api_port,
311311
Enum['http', 'https'] $api_protocol,
312312
Integer $api_timeout,
313313
Boolean $autoupgrade,
314314
Hash $config,
315-
Tea::Absolutepath $configdir,
315+
Stdlib::Absolutepath $configdir,
316316
String $daily_rolling_date_pattern,
317317
Elasticsearch::Multipath $datadir,
318318
Boolean $datadir_instance_directories,
319319
String $default_logging_level,
320-
Tea::Absolutepath $defaults_location,
320+
Stdlib::Absolutepath $defaults_location,
321321
Optional[String] $download_tool,
322322
String $elasticsearch_group,
323323
String $elasticsearch_user,
324324
Enum['dailyRollingFile', 'rollingFile'] $file_rolling_type,
325-
Tea::Absolutepath $homedir,
325+
Stdlib::Absolutepath $homedir,
326326
Hash $indices,
327327
Hash $init_defaults,
328328
Optional[String] $init_defaults_file,
329329
String $init_template,
330330
Hash $instances,
331331
Array[String] $jvm_options,
332-
Tea::Absolutepath $logdir,
332+
Stdlib::Absolutepath $logdir,
333333
Hash $logging_config,
334334
Optional[String] $logging_file,
335335
Optional[String] $logging_template,
336336
Boolean $manage_repo,
337-
Tea::Absolutepath $package_dir,
337+
Stdlib::Absolutepath $package_dir,
338338
Integer $package_dl_timeout,
339339
String $package_name,
340340
Enum['package'] $package_provider,
341341
Optional[String] $package_url,
342-
Optional[Tea::Absolutepath] $pid_dir,
342+
Optional[Stdlib::Absolutepath] $pid_dir,
343343
Hash $pipelines,
344-
Tea::Absolutepath $plugindir,
344+
Stdlib::Absolutepath $plugindir,
345345
Hash $plugins,
346-
Optional[Tea::HTTPUrl] $proxy_url,
346+
Optional[Stdlib::HTTPUrl] $proxy_url,
347347
Boolean $purge_configdir,
348348
Boolean $purge_package_dir,
349349
Boolean $purge_secrets,
350350
Optional[String] $repo_baseurl,
351351
String $repo_key_id,
352-
Tea::HTTPUrl $repo_key_source,
352+
Stdlib::HTTPUrl $repo_key_source,
353353
Optional[Integer] $repo_priority,
354354
Optional[String] $repo_proxy,
355355
Variant[Boolean, String] $repo_stage,
@@ -366,7 +366,7 @@
366366
Enum['init', 'openbsd', 'openrc', 'systemd'] $service_provider,
367367
Elasticsearch::Status $status,
368368
Optional[String] $system_key,
369-
Tea::Absolutepath $systemd_service_path,
369+
Stdlib::Absolutepath $systemd_service_path,
370370
Hash $templates,
371371
Hash $users,
372372
Boolean $validate_tls,

‎manifests/instance.pp

+7-7
Original file line numberDiff line numberDiff line change
@@ -126,28 +126,28 @@
126126
#
127127
define elasticsearch::instance (
128128
Enum['absent', 'present'] $ensure = $elasticsearch::ensure,
129-
Optional[Tea::Absolutepath] $ca_certificate = undef,
130-
Optional[Tea::Absolutepath] $certificate = undef,
129+
Optional[Stdlib::Absolutepath] $ca_certificate = undef,
130+
Optional[Stdlib::Absolutepath] $certificate = undef,
131131
Optional[Hash] $config = undef,
132-
Tea::Absolutepath $configdir = "${elasticsearch::configdir}/${name}",
132+
Stdlib::Absolutepath $configdir = "${elasticsearch::configdir}/${name}",
133133
String $daily_rolling_date_pattern = $elasticsearch::daily_rolling_date_pattern,
134134
Optional[Elasticsearch::Multipath] $datadir = undef,
135135
Boolean $datadir_instance_directories = $elasticsearch::datadir_instance_directories,
136136
Boolean $deprecation_logging = false,
137137
String $deprecation_logging_level = 'DEBUG',
138138
String $file_rolling_type = $elasticsearch::file_rolling_type,
139139
Hash $init_defaults = {},
140-
Optional[Tea::Absolutepath] $init_defaults_file = undef,
140+
Optional[Stdlib::Absolutepath] $init_defaults_file = undef,
141141
String $init_template = $elasticsearch::init_template,
142142
Array[String] $jvm_options = $elasticsearch::jvm_options,
143143
Optional[String] $keystore_password = undef,
144-
Optional[Tea::Absolutepath] $keystore_path = undef,
145-
Tea::Absolutepath $logdir = "${elasticsearch::logdir}/${name}",
144+
Optional[Stdlib::Absolutepath] $keystore_path = undef,
145+
Stdlib::Absolutepath $logdir = "${elasticsearch::logdir}/${name}",
146146
Hash $logging_config = {},
147147
Optional[String] $logging_file = undef,
148148
String $logging_level = $elasticsearch::default_logging_level,
149149
Optional[String] $logging_template = undef,
150-
Optional[Tea::Absolutepath] $private_key = undef,
150+
Optional[Stdlib::Absolutepath] $private_key = undef,
151151
Boolean $purge_secrets = $elasticsearch::purge_secrets,
152152
Integer $rolling_file_max_backup_index = $elasticsearch::rolling_file_max_backup_index,
153153
String $rolling_file_max_file_size = $elasticsearch::rolling_file_max_file_size,

‎manifests/pipeline.pp

+11-11
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@
4545
# @author Tyler Langlois <[email protected]>
4646
#
4747
define elasticsearch::pipeline (
48-
Enum['absent', 'present'] $ensure = 'present',
49-
Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password,
50-
Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username,
51-
Optional[Tea::AbsolutePath] $api_ca_file = $elasticsearch::api_ca_file,
52-
Optional[Tea::AbsolutePath] $api_ca_path = $elasticsearch::api_ca_path,
53-
String $api_host = $elasticsearch::api_host,
54-
Tea::Port $api_port = $elasticsearch::api_port,
55-
Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol,
56-
Integer $api_timeout = $elasticsearch::api_timeout,
57-
Hash $content = {},
58-
Boolean $validate_tls = $elasticsearch::validate_tls,
48+
Enum['absent', 'present'] $ensure = 'present',
49+
Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password,
50+
Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username,
51+
Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file,
52+
Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path,
53+
String $api_host = $elasticsearch::api_host,
54+
Integer[0, 65535] $api_port = $elasticsearch::api_port,
55+
Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol,
56+
Integer $api_timeout = $elasticsearch::api_timeout,
57+
Hash $content = {},
58+
Boolean $validate_tls = $elasticsearch::validate_tls,
5959
) {
6060

6161
es_instance_conn_validator { "${name}-ingest-pipeline":

‎manifests/plugin.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
#
5454
define elasticsearch::plugin (
5555
Enum['absent', 'present'] $ensure = 'present',
56-
Tea::Absolutepath $configdir = $elasticsearch::configdir,
56+
Stdlib::Absolutepath $configdir = $elasticsearch::configdir,
5757
Variant[String, Array[String]] $instances = [],
5858
Optional[String] $module_dir = undef,
5959
Optional[String] $proxy_host = undef,
6060
Optional[String] $proxy_password = undef,
61-
Optional[Tea::Port] $proxy_port = undef,
61+
Optional[Integer[0, 65535]] $proxy_port = undef,
6262
Optional[String] $proxy_username = undef,
6363
Optional[String] $source = undef,
64-
Optional[Tea::HTTPUrl] $url = undef,
64+
Optional[Stdlib::HTTPUrl] $url = undef,
6565
) {
6666

6767
include elasticsearch

‎manifests/template.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
Enum['absent', 'present'] $ensure = 'present',
5757
Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password,
5858
Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username,
59-
Optional[Tea::AbsolutePath] $api_ca_file = $elasticsearch::api_ca_file,
60-
Optional[Tea::AbsolutePath] $api_ca_path = $elasticsearch::api_ca_path,
59+
Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file,
60+
Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path,
6161
String $api_host = $elasticsearch::api_host,
62-
Tea::Port $api_port = $elasticsearch::api_port,
62+
Integer[0, 65535] $api_port = $elasticsearch::api_port,
6363
Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol,
6464
Integer $api_timeout = $elasticsearch::api_timeout,
6565
Optional[Variant[String, Hash]] $content = undef,

‎metadata.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
},
2121
{
2222
"name": "puppetlabs/stdlib",
23-
"version_requirement": ">= 4.6.0 < 5.0.0"
24-
},
25-
{
26-
"name": "puppet/tea",
27-
"version_requirement": ">= 0.2.0 < 1.0.0"
23+
"version_requirement": ">= 4.13.0 < 5.0.0"
2824
}
2925
],
3026
"operatingsystem_support": [

‎spec/spec_helper_acceptance.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class { 'elasticsearch':
164164
hosts.each do |host|
165165
copy_hiera_data_to(host, 'spec/fixtures/hiera/hieradata/')
166166

167-
modules = %w[archive datacat java java_ks stdlib tea]
167+
modules = %w[archive datacat java java_ks stdlib]
168168

169169
dist_module = {
170170
'Debian' => ['apt'],

‎types/multipath.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
type Elasticsearch::Multipath = Variant[Array[Tea::Absolutepath], Tea::Absolutepath]
1+
type Elasticsearch::Multipath = Variant[Array[Stdlib::Absolutepath], Stdlib::Absolutepath]

0 commit comments

Comments
 (0)