diff --git a/ee/tools/puppet/fleetdm/CHANGELOG.md b/ee/tools/puppet/fleetdm/CHANGELOG.md index 699e1dbb88..dc5002a04b 100644 --- a/ee/tools/puppet/fleetdm/CHANGELOG.md +++ b/ee/tools/puppet/fleetdm/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +## Release 0.2.4 + +**Bug Fixes** + +- If a profile preassignment fails during the run, the profile matcher won't update the profiles in the Fleet server. +- Improved error handling for different API calls during profile preassignment to avoid crashing the Puppet run if some of them fail. + ## Release 0.0.0-beta.1 **Features** diff --git a/ee/tools/puppet/fleetdm/CONTRIBUTING.md b/ee/tools/puppet/fleetdm/CONTRIBUTING.md index eb04ddcb42..ff6ad57382 100644 --- a/ee/tools/puppet/fleetdm/CONTRIBUTING.md +++ b/ee/tools/puppet/fleetdm/CONTRIBUTING.md @@ -72,9 +72,21 @@ The only thing left to do is to add the `fleetdm/fleetdm` module to your server. ## Releasing 1. Bump the module version in the [metadata.json](https://github.com/fleetdm/fleet/blob/main/ee/tools/puppet/fleetdm/metadata.json) file. -2. From the `ee/tools/puppet/fleetdm` directory, run `pdk build`. This will generate a `tar.gz` file in the `ee/tools/puppet/fleetdm/pkg/` directory. -3. Login into the [Puppet Forge](https://forge.puppet.com/), credentials are in 1Password. -4. Visit the [upload page](https://forge.puppet.com/upload) and upload the `tar.gz` file you generated. +2. Ensure all new changes are documented in `./CHANGELOG.md` +3. From the `ee/tools/puppet/fleetdm` directory, run `pdk build`. This will generate a `tar.gz` file in the `ee/tools/puppet/fleetdm/pkg/` directory. +4. Perform a last sanity check running `pdk validate` +5. Test the build by extracting the file you just created and executing a Puppet run: +``` +# extract the build +rm -rf /tmp/puppet-module/fleetdm +mkdir -p /tmp/puppet-module/fleetdm +tar -xzf pkg/fleetdm-fleetdm-0.2.4.tar.gz -C /tmp/puppet-module/fleetdm --strip-components=1 + +# run Puppet +puppet apply --debug --test --modulepath="/tmp/puppet-module" --reports=fleetdm --hiera_config hiera.yaml examples/multiple-teams.pp +``` +6. Login into the [Puppet Forge](https://forge.puppet.com/), credentials are in 1Password. +7. Visit the [upload page](https://forge.puppet.com/upload) and upload the `tar.gz` file you generated. ## Development cheatsheet diff --git a/ee/tools/puppet/fleetdm/metadata.json b/ee/tools/puppet/fleetdm/metadata.json index 861b374129..360cb413ea 100644 --- a/ee/tools/puppet/fleetdm/metadata.json +++ b/ee/tools/puppet/fleetdm/metadata.json @@ -1,6 +1,6 @@ { "name": "fleetdm-fleetdm", - "version": "0.2.3", + "version": "0.2.4", "author": "Fleet Device Management Inc", "summary": "MDM management and profile assignment using FleetDM", "license": "proprietary",