Remove legacy top-scope syntax

voxpupuli · Nov 24, 2023 · f9a9707 · f9a9707
1 parent 039cee2
commit f9a9707
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ You can use the module [stahnma-epel](https://forge.puppetlabs.com/stahnma/epel)
 ### Beginning with monit
 
 ```puppet
-include ::monit
+include monit
 ```
 
 ## Usage

diff --git a/examples/check.pp b/examples/check.pp
@@ -1,4 +1,4 @@
-include ::monit
+include monit
 
 monit::check { 'fake':
   content => 'fake content for the fake service check',

diff --git a/examples/init.pp b/examples/init.pp
@@ -9,4 +9,4 @@
 # Learn more about module testing here:
 # http://docs.puppetlabs.com/guides/tests_smoke.html
 #
-include ::monit
+include monit
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -187,8 +187,8 @@
 
   # Use the monit_version fact if available, else use the default for the
   # platform.
-  if defined('$::monit_version') and $::monit_version {
-    $monit_version_real = $::monit_version
+  if $facts['monit_version'] {
+    $monit_version_real = $facts['monit_version']
   } else {
     $monit_version_real = $monit::params::monit_version
   }

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -5,7 +5,7 @@
     # Using puppet_apply as a helper
     it 'works with no errors' do
       pp = <<-EOS
-      include ::monit
+      include monit
       EOS
 
       # Run it twice and test for idempotency

diff --git a/spec/defines/check_spec.rb b/spec/defines/check_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'monit::check' do
   let :pre_condition do
-    'include ::monit'
+    'include monit'
   end
   let(:title) { 'test' }
   let(:facts) do