diff --git a/.kitchen.yml b/.kitchen.yml index 5bf06c3..0eb8a31 100755 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -262,9 +262,9 @@ verifier: chef_dk_version: '4.5.0' inspec_tests: - name: bonusbits_base - git: https://github.com/bonusbits/inspec_bonusbits_base.git + git: https://github.com/bonusbits/bonusbits_base_inspec.git release: 2.1.0 - #- path: ../inspec_bonusbits_base + #- path: ../bonusbits_base_inspec name: inspec reporter: - cli diff --git a/Berksfile.lock b/Berksfile.lock index 7372a4e..db75ae6 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -6,7 +6,7 @@ DEPENDENCIES GRAPH apt (7.2.0) audit (9.0.1) - bonusbits_base (3.0.0) + bonusbits_base (3.0.2) apt (>= 0.0.0) audit (>= 0.0.0) selinux (>= 0.0.0) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5859521..e281d1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,8 @@ ## CHANGE LOG -## x.x.x - TODO List - Levon Becker -* Finish Build CircleCI Task -* Finish Deploy CircleCI Task -* Finish Rake docker/build task -* Finish Rake Kubernetes task -* Finish Rake Deploy task -* Finish Rake CloudFormation task -* Finish Kubernetes configs add to CI testing? -* Improve EC2 discovery (If on EC2 instance or not) -* Add / Test Ubuntu 16.04 LTS / 18.04 LTS -* Get jUnit test results working for rubocop rake task -* Replace attributes with helper method calls -* Added rake task for building Docker image that then can be used to deploy to Kubernetes Cluster locally -* Create CircleCI Orb for common workflow using Rake tasks +## 3.0.2 - 03/19/2020 - Levon Becker +* Renamed inspec_bonusbits_base repo to bonusbits_base_inspec in github. So, needed to updated audit and kitchen config +* Moved todo list to TODO.md ## 3.0.1 - 01/09/2020 - Levon Becker * Changed node attributes json to cover all node hash so includes child cookbooks such as, bonusbits_mediawiki attributes that can be used for inspec tests. @@ -155,7 +144,7 @@ * Bumped Chef Client Version to 12.19.36 * Added CloudWatch Logs configuration * Switched from ServerSpec to InSpec -* Moved Inspec tests to profile repo so can be used by other cookbooks to check settings by this cookbook are correct [HERE](https://github.com/bonusbits/inspec_bonusbits_base) +* Moved Inspec tests to profile repo so can be used by other cookbooks to check settings by this cookbook are correct [HERE](https://github.com/bonusbits/bonusbits_base_inspec) * Updated Gemfile * Removed Coverage badges * Removed TravisCI sticking with CircleCi diff --git a/README.md b/README.md index d51360f..15d230d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Bonus Bits Base Cookbook -[![Project Release](https://img.shields.io/badge/release-v3.0.1-blue.svg)](https://github.com/bonusbits/bonusbits_base) +[![Project Release](https://img.shields.io/badge/release-v3.0.2-blue.svg)](https://github.com/bonusbits/bonusbits_base) [![Circle CI](https://circleci.com/gh/bonusbits/bonusbits_base/tree/master.svg?style=shield)](https://circleci.com/gh/bonusbits/bonusbits_base/tree/master) [![Join the chat at https://gitter.im/bonusbits/bonusbits_base](https://badges.gitter.im/bonusbits/bonusbits_base.svg)](https://gitter.im/bonusbits/bonusbits_base?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![GitHub issues](https://img.shields.io/github/issues/bonusbits/bonusbits_base.svg)](https://github.com/bonusbits/bonusbits_base/issues) @@ -287,23 +287,6 @@ Chef Recipes: ([bonusbits_base, bonusbits_base::default]) --------------------------------------------------------------- ``` - -```--------------------------------------------------------------- -Node Information ---------------------------------------------------------------- -IP Address: (10.0.4.167) -Hostname: (WIN-SSKQF9C3VCF) -FQDN: (WIN-SSKQF9C3VCF) -Platform: (windows) -Platform Version: (6.3.9600) -CPU Count: (1) -Memory: (3839MB) -Detected Environment: (dev) -Chef Environment: (bonusbits_base) -Chef Roles: (["base"]) -Chef Recipes: (["bonusbits_base", "bonusbits_base::default"]) ---------------------------------------------------------------- -``` # Cookbook Dependencies ![](images/cookbook_dependencies.png) @@ -315,19 +298,17 @@ Chef Recipes: (["bonusbits_base", "bonusbits_base::default"]) * Integration * InSpec Profiles * [inspec_bootstrap](https://github.com/bonusbits/inspec_bootstrap.git) - * [inspec_bonusbits_base](https://github.com/bonusbits/inspec_bonusbits_base.git) + * [bonusbits_base_inspec](https://github.com/bonusbits/bonusbits_base_inspec.git) * Ran from Rakefile tasks by CircleCI (.kitchen.dokken.yml) # Resources ## Setup DevOps Workstation - * [Setup Mac DevOps Workstation](http://www.bonusbits.com/wiki/Reference:Mac_OS_DevOps_Workstation_Setup_Check_List) * [Setup Ubuntu DevOps Workstation](http://www.bonusbits.com/wiki/Reference:Ubuntu_DevOps_Workstation_Setup_Check_List) * [Setup Windows DevOps Workstation](http://www.bonusbits.com/wiki/Reference:Windows_DevOps_Workstation_Setup_Check_List) ## Test Kitchen - * [Test Kitchen Official Web Site](http://kitchen.ci/) * [Test Kitchen Github](https://github.com/test-kitchen/test-kitchen) * [Test Kitchen Chef Docs](https://docs.chef.io/kitchen.html) diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..8f920b3 --- /dev/null +++ b/TODO.md @@ -0,0 +1,20 @@ +# ToDo List + +## Rake Tasks +1. Finish Build CircleCI Task +1. Finish Deploy CircleCI Task +1. Finish Rake docker/build task +1. Finish Rake Kubernetes task + 1. Added rake task for building Docker image that then can be used to deploy to Kubernetes Cluster locally +1. Finish Rake Deploy task +1. Finish Rake CloudFormation task +1. Finish Kubernetes configs add to CI testing? + +## General +1. Improve EC2 discovery (If on EC2 instance or not) +1. Add / Test Ubuntu 16.04 LTS / 18.04 LTS +1. Replace attributes with helper method calls + +## CircleCI +1. Get jUnit test results working for rubocop rake task +1. Create CircleCI Orb for common workflow using Rake tasks \ No newline at end of file diff --git a/attributes/audit.rb b/attributes/audit.rb index a714b0a..335066f 100644 --- a/attributes/audit.rb +++ b/attributes/audit.rb @@ -12,13 +12,9 @@ # Audit Cookbook Attributes default['audit']['collector'] = 'chef-visibility' default['audit']['profiles'] = [ - { - name: 'bootstrap', - git: 'https://github.com/bonusbits/inspec_bootstrap.git' - }, { name: 'bonusbits_base', - git: 'https://github.com/bonusbits/inspec_bonusbits_base.git' + git: 'https://github.com/bonusbits/bonusbits_base_inspec.git' } ] end diff --git a/metadata.rb b/metadata.rb index cd675d6..1de2c3c 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Foundation Wrapper Cookbook for all Nodes' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '3.0.1' +version '3.0.2' chef_version '~> 15.4' if respond_to?(:chef_version) source_url 'https://github.com/bonusbits/bonusbits_base' issues_url 'https://github.com/bonusbits/bonusbits_base/issues'