Skip to content

Commit e6555b5

Browse files
LukasAudLukasAud
committed
(CONT-351) Syntax update
Code now compliant with rules regarding: top-scope facts legacy facts top-scope variables
1 parent c3c4d6f commit e6555b5

File tree

13 files changed

+27
-36
lines changed

13 files changed

+27
-36
lines changed

‎.puppet-lint.rc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
--relative
22
--no-parameter_types-check
3-
--no-legacy_facts-check
4-
--no-top_scope_facts-check
53
--no-parameter_documentation-check
6-
--no-topscope_variable-check

‎.sync.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,4 @@ spec/spec_helper.rb:
3838
Rakefile:
3939
extra_disabled_lint_checks:
4040
- parameter_types
41-
- legacy_facts
42-
- top_scope_facts
4341
- parameter_documentation
44-
- topscope_variable

‎Rakefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ end
4343

4444
PuppetLint.configuration.send('disable_relative')
4545
PuppetLint.configuration.send('disable_parameter_types')
46-
PuppetLint.configuration.send('disable_legacy_facts')
47-
PuppetLint.configuration.send('disable_top_scope_facts')
4846
PuppetLint.configuration.send('disable_parameter_documentation')
49-
PuppetLint.configuration.send('disable_topscope_variable')
5047

5148

5249
if Bundler.rubygems.find_name('github_changelog_generator').any?

‎manifests/compose.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
if $raw_url != undef {
6262
$docker_compose_url = $raw_url
6363
} else {
64-
$docker_compose_url = "${base_url}/${version}/docker-compose-${::kernel}-${facts['os']['hardware']}${file_extension}"
64+
$docker_compose_url = "${base_url}/${version}/docker-compose-${facts['kernel']}-${facts['os']['hardware']}${file_extension}"
6565
}
6666

6767
if $proxy != undef {

‎manifests/exec.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
$docker_command = $docker::params::docker_command
3030

3131
if $facts['os']['family'] == 'windows' {
32-
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
32+
$exec_environment = "PATH=${facts['docker_program_files_path']}/Docker/"
3333
$exec_timeout = 3000
34-
$exec_path = ["${::docker_program_files_path}/Docker/",]
34+
$exec_path = ["${facts['docker_program_files_path']}/Docker/",]
3535
$exec_provider = 'powershell'
3636
} else {
3737
$exec_environment = 'HOME=/root'

‎manifests/image.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141

4242
if $facts['os']['family'] == 'windows' {
4343
$update_docker_image_template = 'docker/windows/update_docker_image.ps1.erb'
44-
$update_docker_image_path = "${::docker_user_temp_path}/update_docker_image.ps1"
45-
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
44+
$update_docker_image_path = "${facts['docker_user_temp_path']}/update_docker_image.ps1"
45+
$exec_environment = "PATH=${facts['docker_program_files_path']}/Docker/"
4646
$exec_timeout = 3000
4747
$update_docker_image_owner = undef
48-
$exec_path = ["${::docker_program_files_path}/Docker/",]
48+
$exec_path = ["${facts['docker_program_files_path']}/Docker/",]
4949
$exec_provider = 'powershell'
5050
} else {
5151
$update_docker_image_template = 'docker/update_docker_image.sh.erb'

‎manifests/machine.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
if $ensure == 'present' {
4747
$docker_machine_url = $url ? {
48-
undef => "https://github.com/docker/machine/releases/download/v${version}/docker-machine-${::kernel}-x86_64${file_extension}",
48+
undef => "https://github.com/docker/machine/releases/download/v${version}/docker-machine-${facts['kernel']}-x86_64${file_extension}",
4949
default => $url,
5050
}
5151

‎manifests/params.pp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@
9090
$docker_command = 'docker'
9191

9292
if ($facts['os']['family'] == 'windows') {
93-
$compose_install_path = "${::docker_program_files_path}/Docker"
93+
$compose_install_path = "${facts['docker_program_files_path']}/Docker"
9494
$compose_version = '1.29.2'
9595
$docker_ee_package_name = 'Docker'
96-
$machine_install_path = "${::docker_program_files_path}/Docker"
97-
$tls_cacert = "${::docker_program_data_path}/docker/certs.d/ca.pem"
98-
$tls_cert = "${::docker_program_data_path}/docker/certs.d/server-cert.pem"
99-
$tls_key = "${::docker_program_data_path}/docker/certs.d/server-key.pem"
96+
$machine_install_path = "${facts['docker_program_files_path']}/Docker"
97+
$tls_cacert = "${facts['docker_program_data_path']}/docker/certs.d/ca.pem"
98+
$tls_cert = "${facts['docker_program_data_path']}/docker/certs.d/server-cert.pem"
99+
$tls_key = "${facts['docker_program_data_path']}/docker/certs.d/server-key.pem"
100100
} else {
101101
$compose_install_path = '/usr/local/bin'
102102
$compose_version = '1.29.2'
@@ -243,7 +243,7 @@
243243
$msft_provider_version = $docker_msft_provider_version
244244
$msft_package_version = $version
245245
$service_config_template = 'docker/windows/config/daemon.json.erb'
246-
$service_config = "${::docker_program_data_path}/docker/config/daemon.json"
246+
$service_config = "${facts['docker_program_data_path']}/docker/config/daemon.json"
247247
$docker_group = 'docker'
248248
$package_ce_source_location = undef
249249
$package_ce_key_source = undef

‎manifests/registry.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
$docker_command = $docker::params::docker_command
5252

5353
if $facts['os']['family'] == 'windows' {
54-
$exec_environment = ["PATH=${::docker_program_files_path}/Docker/",]
54+
$exec_environment = ["PATH=${facts['docker_program_files_path']}/Docker/",]
5555
$exec_timeout = 3000
56-
$exec_path = ["${::docker_program_files_path}/Docker/",]
56+
$exec_path = ["${facts['docker_program_files_path']}/Docker/",]
5757
$exec_provider = 'powershell'
5858
$password_env = '$env:password'
5959
$exec_user = undef
@@ -124,7 +124,7 @@
124124
} else {
125125
# server may be an URI, which can contain /
126126
$server_strip = regsubst($server, '[/:]', '_', 'G')
127-
$passfile = "${::docker_user_temp_path}/registry-auth-puppet_receipt_${server_strip}_${local_user}"
127+
$passfile = "${facts['docker_user_temp_path']}/registry-auth-puppet_receipt_${server_strip}_${local_user}"
128128
$_auth_command = "if (-not (${auth_cmd})) { Remove-Item -Path ${passfile} -Force -Recurse -EA SilentlyContinue; exit 1 } else { exit 0 }" # lint:ignore:140chars
129129

130130
if $ensure == 'absent' {

‎manifests/run.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,11 @@
355355
}
356356

357357
if $facts['os']['family'] == 'windows' {
358-
$exec_environment = "PATH=${::docker_program_files_path}/Docker/;${::docker_systemroot}/System32/"
358+
$exec_environment = "PATH=${facts['docker_program_files_path']}/Docker/;${facts['docker_systemroot']}/System32/"
359359
$exec_timeout = 3000
360-
$exec_path = ["${::docker_program_files_path}/Docker/"]
360+
$exec_path = ["${facts['docker_program_files_path']}/Docker/"]
361361
$exec_provider = 'powershell'
362-
$cidfile = "${::docker_user_temp_path}/${service_prefix}${sanitised_title}.cid"
362+
$cidfile = "${facts['docker_user_temp_path']}/${service_prefix}${sanitised_title}.cid"
363363
$restart_check = "${docker_command} inspect ${sanitised_title} -f '{{ if eq \\\"unhealthy\\\" .State.Health.Status }} {{ .Name }}{{ end }}' | findstr ${sanitised_title}" # lint:ignore:140chars
364364
$container_running_check = "\$state = ${docker_command} inspect ${sanitised_title} -f \"{{ .State.Running }}\"; if (\$state -ieq \"true\") { Exit 0 } else { Exit 1 }" # lint:ignore:140chars
365365
} else {
@@ -505,7 +505,7 @@
505505
fail('Restart parameter is required for Windows')
506506
}
507507

508-
$hasstatus = $::docker::params::service_hasstatus
508+
$hasstatus = $docker::params::service_hasstatus
509509
}
510510
}
511511

0 commit comments

Comments
 (0)