Support version 7.0.0

alex-harvey-z3q · Sep 25, 2023 · 94699c9 · 94699c9
1 parent b765040
commit 94699c9
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 15 deletions.
diff --git a/.README.erb b/.README.erb
@@ -77,7 +77,12 @@ earlier|1.8.0
 1.20.0|2.8.0, 2.8.1
 3.0.0|3.0.0, 3.0.1, 3.0.2, 3.1.0, 3.2.0, 3.3.0
 3.4.0|3.4.0
-3.5.0|3.5.0
+3.5.0|3.5.0, 3.6.0
+4.0.0|4.0.0
+4.0.1|4.0.1, 4.1.0
+5.0.0|5.0.0
+6.0.0|6.0.0
+7.0.0|7.0.0, 7.0.1, 7.0.2
 
 Note that Puppet 3 support was dropped in version 1.11.0. Note that the versioning was changed to 3.0.0 to match the upstream versioning without any changes made.
 
@@ -287,12 +292,18 @@ Make sure you have:
 * rake
 * bundler
 
+Pre config:
+
+    bundle config set specific_platform true
+    rm -f Gemfile.lock
+
 Install the necessary gems:
 
-    bundle install
+    bundle install --path vendor/bundle
 
 To run the tests from the root of the source code:
 
+    bundle exec rake spec_prep
     bundle exec rake spec
 
 To run the acceptance tests:
@@ -307,7 +318,7 @@ Ensure you have these lines in `~/.bash_profile`:
 
     export BLACKSMITH_FORGE_URL=https://forgeapi.puppetlabs.com
     export BLACKSMITH_FORGE_USERNAME=alexharvey
-    export BLACKSMITH_FORGE_PASSWORD=xxxxxxxxx
+    export BLACKSMITH_FORGE_API_KEY=xxxxxxxx
 
 Build the module and push to Forge:
 

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+2023009-25 - Version 7.0.0
+- Update to support changes in firewall 7.0.0 (thanks @robertc99)
+- Also support 7.0.1 and 7.0.2
+- Update gen_params.sh
+
 2023-05-26 - Version 6.0.0
 - Update to support changes in firewall 6.0.0 (Issue #36, thanks @robertc99)
 - Update docs to support bundle config set specific_platform true

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ At present the following inputs can be arrays:
 * destination
 * proto
 * icmp
-* provider
+* protocol
 
 ## Support status
 
@@ -86,6 +86,7 @@ earlier|1.8.0
 4.0.1|4.0.1, 4.1.0
 5.0.0|5.0.0
 6.0.0|6.0.0
+7.0.0|7.0.0, 7.0.1, 7.0.2
 
 Note that Puppet 3 support was dropped in version 1.11.0. Note that the versioning was changed to 3.0.0 to match the upstream versioning without any changes made.
 
@@ -141,11 +142,11 @@ resources for arrays of certain inputs.
 
 The following parameters are available in the `firewall_multi` defined type:
 
-* [`source`](#source)
-* [`destination`](#destination)
-* [`proto`](#proto)
-* [`icmp`](#icmp)
-* [`provider`](#provider)
+* [`source`](#-firewall_multi--source)
+* [`destination`](#-firewall_multi--destination)
+* [`proto`](#-firewall_multi--proto)
+* [`icmp`](#-firewall_multi--icmp)
+* [`protocol`](#-firewall_multi--protocol)
 ### Functions
 
 #### <a name="firewall_multi"></a>`firewall_multi`

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -26,6 +26,7 @@
   $condition                   = undef,
   $connlimit_above             = undef,
   $connlimit_mask              = undef,
+  $connlimit_upto              = undef,
   $connmark                    = undef,
   $ctdir                       = undef,
   $ctexpire                    = undef,
@@ -77,7 +78,6 @@
   $kernel_timezone             = undef,
   $length                      = undef,
   $limit                       = undef,
-  $line                        = undef,
   $log_ip_options              = undef,
   $log_level                   = undef,
   $log_prefix                  = undef,
@@ -89,6 +89,7 @@
   $match_mark                  = undef,
   $month_days                  = undef,
   $mss                         = undef,
+  $name                        = undef,
   $nflog_group                 = undef,
   $nflog_prefix                = undef,
   $nflog_range                 = undef,
@@ -137,7 +138,6 @@
   $string_from                 = undef,
   $string_hex                  = undef,
   $string_to                   = undef,
-  $table                       = undef,
   $tcp_flags                   = undef,
   $tcp_option                  = undef,
   $time_contiguous             = undef,
@@ -147,6 +147,7 @@
   $todest                      = undef,
   $toports                     = undef,
   $tosource                    = undef,
+  $u32                         = undef,
   $uid                         = undef,
   $week_days                   = undef,
   $zone                        = undef,
@@ -172,6 +173,7 @@
         condition                   => $condition,
         connlimit_above             => $connlimit_above,
         connlimit_mask              => $connlimit_mask,
+        connlimit_upto              => $connlimit_upto,
         connmark                    => $connmark,
         ctdir                       => $ctdir,
         ctexpire                    => $ctexpire,
@@ -223,7 +225,6 @@
         kernel_timezone             => $kernel_timezone,
         length                      => $length,
         limit                       => $limit,
-        line                        => $line,
         log_ip_options              => $log_ip_options,
         log_level                   => $log_level,
         log_prefix                  => $log_prefix,
@@ -235,6 +236,7 @@
         match_mark                  => $match_mark,
         month_days                  => $month_days,
         mss                         => $mss,
+        name                        => $name,
         nflog_group                 => $nflog_group,
         nflog_prefix                => $nflog_prefix,
         nflog_range                 => $nflog_range,
@@ -283,7 +285,6 @@
         string_from                 => $string_from,
         string_hex                  => $string_hex,
         string_to                   => $string_to,
-        table                       => $table,
         tcp_flags                   => $tcp_flags,
         tcp_option                  => $tcp_option,
         time_contiguous             => $time_contiguous,
@@ -293,6 +294,7 @@
         todest                      => $todest,
         toports                     => $toports,
         tosource                    => $tosource,
+        u32                         => $u32,
         uid                         => $uid,
         week_days                   => $week_days,
         zone                        => $zone,

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "alexharvey-firewall_multi",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "author": "Alex Harvey",
   "summary": "A multiplexer frontend for puppetlabs/firewall",
   "license": "MIT",
@@ -78,7 +78,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/firewall",
-      "version_requirement": ">= 7.0.0 < 8.0.0"
+      "version_requirement": "7.0.2"
     }
   ]
 }