octocatalog-diff 1.5.2 → 2.1.0

data/doc/dev/integration-tests.md

@@ -58,6 +58,6 @@ end
 
 ## Hints for writing an integration test
 
-0. If your integration test deals only with the calculation or display of differences, and not catalog compilation, and you are compiling catalogs multiple times, prefer `spec_catalog_old` and `spec_catalog_new` to pass in pre-compiled catalogs. This will make the test run faster.
+1. If your integration test deals only with the calculation or display of differences, and not catalog compilation, and you are compiling catalogs multiple times, prefer `spec_catalog_old` and `spec_catalog_new` to pass in pre-compiled catalogs. This will make the test run faster.
 
-0. It's a good idea to check the exit code in a test of its own, and then `pending` any subsequent tests if that exit code doesn't match. This way only one test, and not all the tests, will fail if the catalog compilation doesn't work.
+1. It's a good idea to check the exit code in a test of its own, and then `pending` any subsequent tests if that exit code doesn't match. This way only one test, and not all the tests, will fail if the catalog compilation doesn't work.

data/doc/dev/releasing.md

@@ -9,7 +9,7 @@ The project maintainers are responsible for bumping the version number, regenera
 To test the new version of `octocatalog-diff` in the GitHub Puppet repository, check out `github/puppet` and:
 
 - Start a new branch based off master
-- Run `script/update-octocatalog-diff -r <ocd_branch_name>`
+- Run `script/update-octocatalog-diff <ocd_branch_name>`
 - Confirm and commit the result
 - Make sure all CI jobs pass
 - Run the `puppet-catalog-diff` CI job and make sure it passes and shows expected results
@@ -18,65 +18,65 @@ To test the new version of `octocatalog-diff` in the GitHub Puppet repository, c
 
 This section is useful when releasing a new version based on one PR submitted by a contributor. Following this workflow is important so that the contributor gets appropriate credit in the revision history for his or her work.
 
-0. In your local checkout, start a new branch based off master.
-0. Add the contributor's repository as a remote. For example:
+1. In your local checkout, start a new branch based off master.
+1. Add the contributor's repository as a remote. For example:
 
-  ```
-  git remote add octocat https://github.com/octocat/octocatalog-diff.git
-  ```
+    ```
+    git remote add octocat https://github.com/octocat/octocatalog-diff.git
+    ```
 
-0. Merge in the contributor's branch into your own. For example:
+1. Merge in the contributor's branch into your own. For example:
 
-  ```
-  git merge octocat/some-branch
-  ```
+    ```
+    git merge octocat/some-branch
+    ```
 
-0. Update `.version` and `doc/CHANGELOG.md` appropriately. In CHANGELOG you should link to the PR submitted by the contributor (not the PR you're creating now).
-0. Commit your changes to `.version` and `doc/CHANGELOG.md`.
-0. If necessary, auto-generate the build documentation, and commit the changes to your branch.
+1. Update `.version` and `doc/CHANGELOG.md` appropriately. In CHANGELOG you should link to the PR submitted by the contributor (not the PR you're creating now).
+1. Commit your changes to `.version` and `doc/CHANGELOG.md`.
+1. If necessary, auto-generate the build documentation, and commit the changes to your branch.
 
-  ```
-  rake doc:build
-  ```
+    ```
+    rake doc:build
+    ```
 
-0. Open a Pull Request based on your branch. Confirm that the history is correct, showing the contributor's commits first, and then your commit(s) updating the version file, change log, and/or auto-generated documentation.
-0. Ensure that CI tests are all passing.
-0. Ensure that you've performed "local testing" within GitHub (typically, ~1 day) to confirm the changes.
-0. Merge your PR and delete your branch.
-0. Confirm that the contributor's PR now appears as merged, and any associated issues have been closed.
+1. Open a Pull Request based on your branch. Confirm that the history is correct, showing the contributor's commits first, and then your commit(s) updating the version file, change log, and/or auto-generated documentation.
+1. Ensure that CI tests are all passing.
+1. Ensure that you've performed "local testing" within GitHub (typically, ~1 day) to confirm the changes.
+1. Merge your PR and delete your branch.
+1. Confirm that the contributor's PR now appears as merged, and any associated issues have been closed.
 
 ## Merging multiple PRs
 
 If multiple PRs will constitute a release, it's generally easier to merge each such PR individually, and then create a separate PR afterwards to update the necessary files.
 
-0. Merge all constituent PRs and ensure that any associated issues have been closed.
-0. Create your own branch based off master.
-0. Update `.version` and `doc/CHANGELOG.md` appropriately. In CHANGELOG you should link to the PR submitted by the contributor (not the PR you're creating now).
-0. Commit your changes to `.version` and `doc/CHANGELOG.md`.
-0. If necessary, auto-generate the build documentation, and commit the changes to your branch.
+1. Merge all constituent PRs and ensure that any associated issues have been closed.
+1. Create your own branch based off master.
+1. Update `.version` and `doc/CHANGELOG.md` appropriately. In CHANGELOG you should link to the PR submitted by the contributor (not the PR you're creating now).
+1. Commit your changes to `.version` and `doc/CHANGELOG.md`.
+1. If necessary, auto-generate the build documentation, and commit the changes to your branch.
 
-  ```
-  rake doc:build
-  ```
+    ```
+    rake doc:build
+    ```
 
-0. Open a Pull Request based on your branch.
-0. Ensure that CI tests are all passing.
-0. Ensure that you've performed "local testing" within GitHub (typically, ~1 day) to confirm the changes.
-0. Merge your PR and delete your branch.
+1. Open a Pull Request based on your branch.
+1. Ensure that CI tests are all passing.
+1. Ensure that you've performed "local testing" within GitHub (typically, ~1 day) to confirm the changes.
+1. Merge your PR and delete your branch.
 
 ## Releasing
 
 Generally, a new release will correspond to a merge to master of one or more Pull Requests.
 
-0. Ensure that all changes associated with the release have been merged to master.
-  - Merge all Pull Requests associated with release, including the version number bump, change log update, etc.
-  - If necessary (for significant changes), complete a Pull Request to update the top-level README file.
-0. Ensure the the master branch is checked out on your system.
-0. Run the release procedure:
+1. Ensure that all changes associated with the release have been merged to master.
+    - Merge all Pull Requests associated with release, including the version number bump, change log update, etc.
+    - If necessary (for significant changes), complete a Pull Request to update the top-level README file.
+1. Ensure the the master branch is checked out on your system.
+1. Run the release procedure:
 
-  ```
-  rake gem:release
-  ```
+    ```
+    rake gem:release
+    ```
 
 This rake task handles the following:
 

data/doc/dev/run-from-branch.md

@@ -8,38 +8,38 @@ This document is intended for people who may not be familiar with git, GitHub, a
 
 1. Determine the branch name. If there's an open Pull Request, you can see the branch name near the top of the page.
 
-  ![Pull Request branch](/doc/images/pull-request-identify-branch.png)
+    ![Pull Request branch](/doc/images/pull-request-identify-branch.png)
 
-2. Clone the `octocatalog-diff` repository in your home directory. From the command line:
+1. Clone the `octocatalog-diff` repository in your home directory. From the command line:
 
-  ```
-  cd $HOME
-  git clone https://github.com/github/octocatalog-diff.git
-  ```
+    ```
+    cd $HOME
+    git clone https://github.com/github/octocatalog-diff.git
+    ```
 
-3. Change into the directory created by your checkout:
+1. Change into the directory created by your checkout:
 
-  ```
-  cd $HOME/octocatalog-diff
-  ```
+    ```
+    cd $HOME/octocatalog-diff
+    ```
 
-4. Check out the branch you wish to use, filling in the branch name you determined in the first step:
+1. Check out the branch you wish to use, filling in the branch name you determined in the first step:
 
-  ```
-  git checkout BRANCH_NAME_FROM_STEP_1
-  ```
+    ```
+    git checkout BRANCH_NAME_FROM_STEP_1
+    ```
 
-5. Bootstrap the repository to pull in dependencies:
+1. Bootstrap the repository to pull in dependencies:
 
-  ```
-  ./script/bootstrap
-  ```
+    ```
+    ./script/bootstrap
+    ```
 
-6. Optional but recommended - run the test suite:
+1. Optional but recommended - run the test suite:
 
-  ```
-  rake
-  ```
+    ```
+    rake
+    ```
 
 ## Use
 
@@ -53,7 +53,7 @@ We've created a wrapper script to make this easier for you.
     cd /etc/puppetlabs/code
     ```
 
-2. Run the `script/octocatalog-diff-wrapper` script from *this* checkout. For example, if you checked out `octocatalog-diff` to your home directory, you could use:
+1. Run the `script/octocatalog-diff-wrapper` script from *this* checkout. For example, if you checked out `octocatalog-diff` to your home directory, you could use:
 
     ```
     $HOME/octocatalog-diff/script/octocatalog-diff-wrapper <options>

data/doc/installation.md

@@ -25,26 +25,26 @@ For general information on installing gems, see: [RubyGems Basics](http://guides
 
 To install from source, you'll need a git client and internet access.
 
-0. Clone the repository
+1. Clone the repository
 
-  ```
-  git clone https://github.com/github/octocatalog-diff.git
-  ```
+    ```
+    git clone https://github.com/github/octocatalog-diff.git
+    ```
 
-0. Bootstrap the repository (this will install dependent gems in the project)
+1. Bootstrap the repository (this will install dependent gems in the project)
 
-  ```
-  cd octocatalog-diff
-  ./script/bootstrap
-  ```
+    ```
+    cd octocatalog-diff
+    ./script/bootstrap
+    ```
 
-0. RECOMMENDED: Make sure the tests pass on your machine
+1. RECOMMENDED: Make sure the tests pass on your machine
 
-  ```
-  rake
-  ```
+    ```
+    rake
+    ```
 
-  Note: If tests fail on your machine with a clean checkout of the master branch, we would definitely appreciate if you would report it. Please [open an issue](https://github.com/github/octocatalog-diff/issues/new) with the output and some information about your system (e.g. OS, ruby version, etc.) to let us know.
+    Note: If tests fail on your machine with a clean checkout of the master branch, we would definitely appreciate if you would report it. Please [open an issue](https://github.com/github/octocatalog-diff/issues/new) with the output and some information about your system (e.g. OS, ruby version, etc.) to let us know.
 
 Once the code is downloaded and bootstrapped, please proceed to [Configuration](/doc/configuration.md).
 

data/doc/limitations.md

@@ -2,23 +2,23 @@
 
 Testing of Puppet catalogs is faster than running the agent, but you need to be careful of the following limitations:
 
-0. Facts are not taken from a live agent run
+1. Facts are not taken from a live agent run
 
-  octocatalog-diff by default uses the facts reported from a node's more recent Puppet run. If you have made changes to custom facts, catalog testing will **NOT** be an adequate test of whether your custom facts worked. (You can still use octocatalog-diff to help predict changes to nodes based on changes to facts, by overriding facts on the command line.)
+    octocatalog-diff by default uses the facts reported from a node's more recent Puppet run. If you have made changes to custom facts, catalog testing will **NOT** be an adequate test of whether your custom facts worked. (You can still use octocatalog-diff to help predict changes to nodes based on changes to facts, by overriding facts on the command line.)
 
-0. Agents handle depenency ordering and implementation details
+1. Agents handle depenency ordering and implementation details
 
-  The catalog defines the state of the system, but it's up to the agent to determine how to bring the system to a point that matches the catalog. The agent is responsible for order of operations and actually making the change.
+    The catalog defines the state of the system, but it's up to the agent to determine how to bring the system to a point that matches the catalog. The agent is responsible for order of operations and actually making the change.
 
-  Two specific situations that catalog testing does **NOT** detect are:
+    Two specific situations that catalog testing does **NOT** detect are:
 
-  - Dependency loops (e.g., you have made A require B, B require C, and C require A).
+    - Dependency loops (e.g., you have made A require B, B require C, and C require A).
 
-  - Operations not supported by the provider. For example, assume that in your current Puppet manifests, you set the size of a file system to 100 GB. You change this in your new branch to 50 GB. octocatalog-diff will dutifully report this change to you. However, the agent will fail to make the change, because it is not possible to shrink a file system from 100 GB to 50 GB.
+    - Operations not supported by the provider. For example, assume that in your current Puppet manifests, you set the size of a file system to 100 GB. You change this in your new branch to 50 GB. octocatalog-diff will dutifully report this change to you. However, the agent will fail to make the change, because it is not possible to shrink a file system from 100 GB to 50 GB.
 
-0. Changes in underlying providers may not be noticed
+1. Changes in underlying providers may not be noticed
 
-  Consider that you are using a Puppet module that creates a file system. The current implementation of that module checks to see if *any* file system is present on the device, and creates a new file system there if no file system was present. You upgrade the module, and the new version checks to see if *the specified* file system is present on the device, and reformats the device with the specified file system (regardless of whether there was no file system or if there was an existing file system of a different type). There would be no catalog changes (hence octocatalog-diff would report nothing) because the catalog simply instructs the agent to create a file system of the specified type at the defined location. However, the actual implementation of those instructions has changed dramatically.
+    Consider that you are using a Puppet module that creates a file system. The current implementation of that module checks to see if *any* file system is present on the device, and creates a new file system there if no file system was present. You upgrade the module, and the new version checks to see if *the specified* file system is present on the device, and reformats the device with the specified file system (regardless of whether there was no file system or if there was an existing file system of a different type). There would be no catalog changes (hence octocatalog-diff would report nothing) because the catalog simply instructs the agent to create a file system of the specified type at the defined location. However, the actual implementation of those instructions has changed dramatically.
 
 In general catalog testing is great for:
 

data/doc/optionsref.md

@@ -9,7 +9,8 @@
 
 ```
 Usage: octocatalog-diff [command line options]
-    -n, --hostname HOSTNAME          Use PuppetDB facts from last run of hostname
+    -n HOSTNAME1[,HOSTNAME2[,...]],  Use PuppetDB facts from last run of a hostname or a comma separated list of multiple hostnames
+        --hostname
         --basedir DIRNAME            Use an alternate base directory (git checkout of puppet repository)
     -f, --from FROM_BRANCH           Branch you are coming from
     -t, --to TO_BRANCH               Branch you are going to
@@ -36,6 +37,8 @@ Usage: octocatalog-diff [command line options]
         --fact-file STRING           Override fact globally
         --to-fact-file STRING        Override fact for the to branch
         --from-fact-file STRING      Override fact for the from branch
+        --[no-]puppetdb-package-inventory
+                                     Include Puppet Enterprise package inventory data, if found
         --save-catalog STRING        Save intermediate catalogs into files globally
         --to-save-catalog STRING     Save intermediate catalogs into files for the to branch
         --from-save-catalog STRING   Save intermediate catalogs into files for the from branch
@@ -71,6 +74,7 @@ Usage: octocatalog-diff [command line options]
         --from-enc PATH              Path to ENC script (for the from catalog only)
         --to-enc PATH                Path to ENC script (for the to catalog only)
         --[no-]display-detail-add    Display parameters and other details for added resources
+        --[no-]use-lcs               Use the LCS algorithm to determine differences in arrays
         --[no-]truncate-details      Truncate details with --display-detail-add
         --no-header                  Do not print a header
         --default-header             Print default header with output
@@ -86,7 +90,18 @@ Usage: octocatalog-diff [command line options]
         --puppet-binary STRING       Full path to puppet binary globally
         --to-puppet-binary STRING    Full path to puppet binary for the to branch
         --from-puppet-binary STRING  Full path to puppet binary for the from branch
+        --puppet-master-token-file STRING
+                                     File containing PE RBAC token to authenticate to the Puppetserver API v4 globally
+        --to-puppet-master-token-file STRING
+                                     File containing PE RBAC token to authenticate to the Puppetserver API v4 for the to branch
+        --from-puppet-master-token-file STRING
+                                     File containing PE RBAC token to authenticate to the Puppetserver API v4 for the from branch
         --facts-terminus STRING      Facts terminus: one of yaml, facter
+        --puppet-master-token STRING PE RBAC token to authenticate to the Puppetserver API v4 globally
+        --to-puppet-master-token STRING
+                                     PE RBAC token to authenticate to the Puppetserver API v4 for the to branch
+        --from-puppet-master-token STRING
+                                     PE RBAC token to authenticate to the Puppetserver API v4 for the from branch
         --puppetdb-token TOKEN       Token to access the PuppetDB API
         --puppetdb-token-file PATH   Path containing token for PuppetDB API, relative or absolute
         --puppetdb-url URL           PuppetDB base URL
@@ -110,11 +125,23 @@ Usage: octocatalog-diff [command line options]
         --to-puppet-master STRING    Hostname or Hostname:PortNumber for Puppet Master for the to branch
         --from-puppet-master STRING  Hostname or Hostname:PortNumber for Puppet Master for the from branch
         --puppet-master-api-version STRING
-                                     Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) globally
+                                     Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) globally
         --to-puppet-master-api-version STRING
-                                     Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the to branch
+                                     Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) for the to branch
         --from-puppet-master-api-version STRING
-                                     Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the from branch
+                                     Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) for the from branch
+        --[no-]puppet-master-update-catalog
+                                     Update catalog in PuppetDB when using Puppetmaster API version 4 globally
+        --[no-]to-puppet-master-update-catalog
+                                     Update catalog in PuppetDB when using Puppetmaster API version 4 for the to branch
+        --[no-]from-puppet-master-update-catalog
+                                     Update catalog in PuppetDB when using Puppetmaster API version 4 for the from branch
+        --[no-]puppet-master-update-facts
+                                     Update facts in PuppetDB when using Puppetmaster API version 4 globally
+        --[no-]to-puppet-master-update-facts
+                                     Update facts in PuppetDB when using Puppetmaster API version 4 for the to branch
+        --[no-]from-puppet-master-update-facts
+                                     Update facts in PuppetDB when using Puppetmaster API version 4 for the from branch
         --puppet-master-ssl-ca STRING
                                      Full path to CA certificate that signed the Puppet Master certificate globally
         --to-puppet-master-ssl-ca STRING
@@ -158,6 +185,8 @@ Usage: octocatalog-diff [command line options]
         --no-ignore-tags             Disable ignoring based on tags
         --ignore-tags STRING1[,STRING2[,...]]
                                      Specify tags to ignore
+        --compare-file-text-ignore-tags STRING1[,STRING2[,...]]
+                                     Tags that exclude a file resource from text comparison
         --[no-]preserve-environments Enable or disable environment preservation
         --environment STRING         Environment for catalog compilation globally
         --to-environment STRING      Environment for catalog compilation for the to branch
@@ -347,6 +376,21 @@ what is most often desired. (<a href="../lib/octocatalog-diff/cli/options/compar
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--compare-file-text-ignore-tags STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Tags that exclude a file resource from text comparison
+    </td>
+    <td valign=top>
+      When a file is specified with `source => 'puppet:///modules/something/foo.txt'`, remove
+the 'source' attribute and populate the 'content' attribute with the text of the file.
+This allows for a diff of the content, rather than a diff of the location, which is
+what is most often desired. (<a href="../lib/octocatalog-diff/cli/options/compare_file_text.rb">compare_file_text.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--create-symlinks STRING1[,STRING2[,...]]</code></pre>
@@ -718,7 +762,7 @@ Puppet control repo template, the value of this should be 'hieradata', which is
       <pre><code>--from-puppet-master-api-version STRING</code></pre>
     </td>
     <td valign=top>
-      Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the from branch
+      Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) for the from branch
     </td>
     <td valign=top>
       Specify the API version to use for the Puppet Master. This makes it possible to authenticate to a
@@ -780,6 +824,32 @@ This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/opti
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--from-puppet-master-token STRING</code></pre>
+    </td>
+    <td valign=top>
+      PE RBAC token to authenticate to the Puppetserver API v4 for the from branch
+    </td>
+    <td valign=top>
+      Specify a PE RBAC token used to authenticate to Puppetserver for v4
+catalog API calls. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token.rb">puppet_master_token.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-puppet-master-token-file STRING</code></pre>
+    </td>
+    <td valign=top>
+      File containing PE RBAC token to authenticate to the Puppetserver API v4 for the from branch
+    </td>
+    <td valign=top>
+      Specify a path to a file containing a PE RBAC token used to authenticate to the
+Puppetserver for a v4 catalog API call. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token_file.rb">puppet_master_token_file.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--from-puppetdb
@@ -856,14 +926,17 @@ Puppet control repo template, the value of this should be 'hieradata', which is
 
   <tr>
     <td valign=top>
-      <pre><code>-n HOSTNAME
---hostname HOSTNAME</code></pre>
+      <pre><code>-n HOSTNAME1[,HOSTNAME2[,...]]
+--hostname HOSTNAME1[,HOSTNAME2[,...]]</code></pre>
     </td>
     <td valign=top>
-      Use PuppetDB facts from last run of hostname
+      Use PuppetDB facts from last run of a hostname or a comma separated list of multiple hostnames
     </td>
     <td valign=top>
-      Set hostname, which is used to look up facts in PuppetDB, and in the header of diff display. (<a href="../lib/octocatalog-diff/cli/options/hostname.rb">hostname.rb</a>)
+      Set hostname, which is used to look up facts in PuppetDB, and in the header of diff display.
+This option can recieve a single hostname, or a comma separated list of
+multiple hostnames, which are split into an Array. Multiple hostnames do not
+work with the `catalog-only` or `bootstrap-then-exit` options. (<a href="../lib/octocatalog-diff/cli/options/hostname.rb">hostname.rb</a>)
     </td>
   </tr>
 
@@ -1235,7 +1308,7 @@ to work correctly. (<a href="../lib/octocatalog-diff/cli/options/preserve_enviro
       <pre><code>--puppet-master-api-version STRING</code></pre>
     </td>
     <td valign=top>
-      Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) globally
+      Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) globally
     </td>
     <td valign=top>
       Specify the API version to use for the Puppet Master. This makes it possible to authenticate to a
@@ -1297,6 +1370,32 @@ This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/opti
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--puppet-master-token STRING</code></pre>
+    </td>
+    <td valign=top>
+      PE RBAC token to authenticate to the Puppetserver API v4 globally
+    </td>
+    <td valign=top>
+      Specify a PE RBAC token used to authenticate to Puppetserver for v4
+catalog API calls. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token.rb">puppet_master_token.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--puppet-master-token-file STRING</code></pre>
+    </td>
+    <td valign=top>
+      File containing PE RBAC token to authenticate to the Puppetserver API v4 globally
+    </td>
+    <td valign=top>
+      Specify a path to a file containing a PE RBAC token used to authenticate to the
+Puppetserver for a v4 catalog API call. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token_file.rb">puppet_master_token_file.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--puppetdb-api-version N</code></pre>
@@ -1310,6 +1409,23 @@ the default. (<a href="../lib/octocatalog-diff/cli/options/puppetdb_api_version.
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--puppetdb-package-inventory
+--no-puppetdb-package-inventory </code></pre>
+    </td>
+    <td valign=top>
+      Include Puppet Enterprise package inventory data, if found
+    </td>
+    <td valign=top>
+      When pulling facts from PuppetDB in a Puppet Enterprise environment, also include
+the Puppet Enterprise Package Inventory data in the fact results, if available.
+Generally you should not need to specify this, but including the package inventory
+data will produce a more accurate set of input facts for environments using
+package inventory. (<a href="../lib/octocatalog-diff/cli/options/puppetdb_package_inventory.rb">puppetdb_package_inventory.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--puppetdb-ssl-ca FILENAME</code></pre>
@@ -1683,7 +1799,7 @@ Puppet control repo template, the value of this should be 'hieradata', which is
       <pre><code>--to-puppet-master-api-version STRING</code></pre>
     </td>
     <td valign=top>
-      Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the to branch
+      Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) for the to branch
     </td>
     <td valign=top>
       Specify the API version to use for the Puppet Master. This makes it possible to authenticate to a
@@ -1745,6 +1861,32 @@ This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/opti
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--to-puppet-master-token STRING</code></pre>
+    </td>
+    <td valign=top>
+      PE RBAC token to authenticate to the Puppetserver API v4 for the to branch
+    </td>
+    <td valign=top>
+      Specify a PE RBAC token used to authenticate to Puppetserver for v4
+catalog API calls. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token.rb">puppet_master_token.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-puppet-master-token-file STRING</code></pre>
+    </td>
+    <td valign=top>
+      File containing PE RBAC token to authenticate to the Puppetserver API v4 for the to branch
+    </td>
+    <td valign=top>
+      Specify a path to a file containing a PE RBAC token used to authenticate to the
+Puppetserver for a v4 catalog API call. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token_file.rb">puppet_master_token_file.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--to-save-catalog STRING</code></pre>
@@ -1772,6 +1914,19 @@ has no effect when `--display-detail-add` is not used. (<a href="../lib/octocata
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--use-lcs
+--no-use-lcs </code></pre>
+    </td>
+    <td valign=top>
+      Use the LCS algorithm to determine differences in arrays
+    </td>
+    <td valign=top>
+      Configures using the Longest common subsequence (LCS) algorithm to determine differences in arrays (<a href="../lib/octocatalog-diff/cli/options/use_lcs.rb">use_lcs.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--validate-references