Merge pull request #372 from david22swan/bugfix/main/firewall_fix

(BACKWARDS-INCOMPATIBLE) Update firewall manifests to use `jump` instead of `action`

Author: bastelfreak

.fixtures.yml

@@ -17,8 +17,6 @@ fixtures:
     postgresql:
       repo: 'https://github.com/puppetlabs/puppetlabs-postgresql.git'
       ref: 'v9.2.0'
-    firewall:
-      repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
-      ref: 'v6.0.0'
+    firewall: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
   symlinks:
     puppetdb: '#{source_dir}'

manifests/server/firewall.pp

@@ -11,17 +11,17 @@
 
   if ($open_http_port) {
     firewall { "${http_port} accept - puppetdb":
-      dport  => $http_port,
-      proto  => 'tcp',
-      action => 'accept',
+      dport => $http_port,
+      proto => 'tcp',
+      jump  => 'accept',
     }
   }
 
   if ($open_ssl_port) {
     firewall { "${ssl_port} accept - puppetdb":
-      dport  => $ssl_port,
-      proto  => 'tcp',
-      action => 'accept',
+      dport => $ssl_port,
+      proto => 'tcp',
+      jump  => 'accept',
     }
   }
 }

metadata.json

@@ -18,7 +18,7 @@
     },
     {
       "name": "puppetlabs/firewall",
-      "version_requirement": ">= 1.1.3 < 7.0.0"
+      "version_requirement": ">= 7.0.0 < 8.0.0"
     },
     {
       "name": "puppetlabs/stdlib",

spec/support/unit/shared/server.rb

@@ -21,7 +21,7 @@
       .with(
         dport: with[:http_port],
         proto: 'tcp',
-        action: 'accept',
+        jump: 'accept',
       )
   }
 
@@ -31,7 +31,7 @@
       .with(
         dport: with[:ssl_port],
         proto: 'tcp',
-        action: 'accept',
+        jump: 'accept',
       )
   }
 end