Showing with 629 additions and 254 deletions.
  1. +2 −0 .fixtures-latest.yml
  2. +3 −0 .fixtures.yml
  3. +23 −56 .travis.yml
  4. +25 −27 CHANGELOG.md
  5. +31 −12 README.md
  6. +76 −1 REFERENCE.md
  7. +2 −1 appveyor.yml
  8. +34 −0 lib/puppet/provider/sensu_license/sensuctl.rb
  9. +2 −2 lib/puppet/provider/sensuctl.rb
  10. +2 −1 lib/puppet/type/sensu_bonsai_asset.rb
  11. +46 −0 lib/puppet/type/sensu_license.rb
  12. +15 −4 manifests/agent.pp
  13. +22 −0 manifests/agent/subscription.pp
  14. +4 −6 manifests/backend.pp
  15. +5 −1 metadata.json
  16. +14 −0 spec/acceptance/01_agent_spec.rb
  17. +51 −0 spec/acceptance/05_enterprise_spec.rb
  18. +2 −2 spec/acceptance/nodesets/debian-10.yml
  19. +2 −2 spec/acceptance/nodesets/debian-8.yml
  20. +2 −2 spec/acceptance/nodesets/debian-9.yml
  21. +2 −2 spec/acceptance/nodesets/ubuntu-1604.yml
  22. +2 −2 spec/acceptance/nodesets/ubuntu-1804.yml
  23. +13 −13 spec/acceptance/sensu_bolt_tasks_spec.rb
  24. +12 −0 spec/acceptance/sensu_bonsai_asset.rb
  25. +14 −1 spec/acceptance/windows_spec.rb
  26. +62 −72 spec/classes/agent_spec.rb
  27. +9 −13 spec/classes/backend_spec.rb
  28. +21 −0 spec/defines/agent_subscription_spec.rb
  29. +0 −3 spec/spec_helper.rb
  30. +1 −1 spec/unit/provider/sensu_ad_auth/sensu_api_spec.rb
  31. +1 −2 spec/unit/provider/sensu_ad_auth/sensuctl_spec.rb
  32. +1 −1 spec/unit/provider/sensu_bonsai_asset/sensu_api_spec.rb
  33. +1 −1 spec/unit/provider/sensu_bonsai_asset/sensuctl_spec.rb
  34. +1 −1 spec/unit/provider/sensu_ldap_auth/sensu_api_spec.rb
  35. +1 −1 spec/unit/provider/sensu_ldap_auth/sensuctl_spec.rb
  36. +27 −0 spec/unit/provider/sensu_license/sensuctl_spec.rb
  37. +5 −5 spec/unit/provider/sensu_plugin/sensu_install_spec.rb
  38. +10 −2 spec/unit/provider/sensuctl_spec.rb
  39. +4 −0 spec/unit/sensu_bonsai_asset_spec.rb
  40. +60 −0 spec/unit/sensu_license.rb
  41. +1 −0 tasks/install_agent_windows.ps1
  42. +1 −1 tests/provision_basic_debian.sh
  43. +1 −1 tests/provision_basic_el.sh
  44. +1 −0 tests/provision_basic_win.ps1
  45. +1 −2 tests/sensu-backend-cluster.pp
  46. +12 −11 tests/sensu-backend-federated-cluster.pp
  47. +1 −1 tests/sensu-cli.pp
  48. +1 −1 tests/test_bolt_win.ps1
2 changes: 2 additions & 0 deletions .fixtures-latest.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ fixtures:
repo: git://github.com/puppetlabs/puppetlabs-apt.git
stdlib:
repo: git://github.com/puppetlabs/puppetlabs-stdlib.git
datacat:
repo: git://github.com/richardc/puppet-datacat.git
yumrepo_core:
repo: git://github.com/puppetlabs/puppetlabs-yumrepo_core
puppet_version: ">= 6.0.0"
Expand Down
3 changes: 3 additions & 0 deletions .fixtures.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ fixtures:
stdlib:
repo: git://github.com/puppetlabs/puppetlabs-stdlib.git
ref: 5.1.0
datacat:
repo: git://github.com/richardc/puppet-datacat.git
ref: 0.6.2
yumrepo_core:
repo: git://github.com/puppetlabs/puppetlabs-yumrepo_core
ref: 1.0.1
Expand Down
79 changes: 23 additions & 56 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
---
language: ruby

bundler_args: --without system_tests development

cache: bundler

before_install:
Expand All @@ -25,250 +23,219 @@ script: 'bundle exec rake $CHECK'
matrix:
fast_finish: true
include:
- rvm: 2.4.5
- rvm: 2.4.9
env: CHECK="validate lint strings:generate reference" PUPPET_GEM_VERSION="~> 5"
stage: unit
bundler_args: --without system_tests development
- rvm: 2.5.7
env: CHECK="validate lint strings:generate reference" PUPPET_GEM_VERSION="~> 6"
stage: unit
- rvm: 2.4.5
bundler_args: --without system_tests development
- rvm: 2.4.9
env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5"
stage: unit
- rvm: 2.4.5
bundler_args: --without system_tests development
- rvm: 2.4.9
env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml"
stage: unit
bundler_args: --without system_tests development
- rvm: 2.5.7
env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6"
stage: unit
bundler_args: --without system_tests development
- rvm: 2.5.7
env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml"
stage: unit
- rvm: 2.4.5
bundler_args: --without system_tests development
- rvm: 2.4.9
services: docker
env: BEAKER_set="centos-6" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="centos-6" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="centos-6" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="centos-7" BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_sensu_full=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="centos-7" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_full=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="centos-7" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_full=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="centos-7" BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_sensu_full=yes BEAKER_sensu_use_agent=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="centos-7" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_full=yes BEAKER_sensu_use_agent=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="centos-7-cluster" BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_sensu_cluster=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="centos-7-cluster" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_cluster=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="centos-7-cluster" BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_sensu_cluster=yes BEAKER_sensu_use_agent=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="centos-7-cluster" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_cluster=yes BEAKER_sensu_use_agent=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="centos-7-cluster" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_cluster=yes
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="centos-8" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="centos-8" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="centos-8" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="debian-9" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="debian-9" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="debian-9" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="debian-10" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="debian-10" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="debian-10" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="ubuntu-1604" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="ubuntu-1604" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="ubuntu-1604" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="debian-8" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="debian-8" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="debian-8" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="ubuntu-1804" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="ubuntu-1804" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="ubuntu-1804" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="amazonlinux-2" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="amazonlinux-2" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="amazonlinux-2" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.4.5
- rvm: 2.4.9
services: docker
env: BEAKER_set="amazonlinux-201803" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_set="amazonlinux-201803" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- rvm: 2.5.7
services: docker
env: BEAKER_sensu_ci_build=yes BEAKER_set="amazonlinux-201803" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
stage: acceptance
- env: DEPLOY_TO_FORGE=yes
stage: deploy
allow_failures:
- rvm: 2.4.5
- rvm: 2.4.9
env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml"
- rvm: 2.5.7
env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml"
Expand Down
Loading