Skip to content
This repository has been archived by the owner on May 28, 2018. It is now read-only.

Commit

Permalink
2.0.0
Browse files Browse the repository at this point in the history
-----
- Now requires Chef 13 or newer
- Use vagrant images hosted at https://app.vagrantup.com/bento
- Added testing with Chef 13 and 14
- Ported minitests to Inspec
- Changed default terraform version to 0.11.7
  • Loading branch information
haidangwa committed May 22, 2018
1 parent 4e20bdf commit 63d257f
Show file tree
Hide file tree
Showing 29 changed files with 602 additions and 239 deletions.
36 changes: 24 additions & 12 deletions .kitchen.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<%
test_platforms = %w[
ubuntu-14.04 ubuntu-15.10 ubuntu-16.10 debian-8.6 centos-7.5 centos-6.9
fedora-25]
chef_versions = %w[13 14]
%>
---
driver:
name: vagrant
Expand All @@ -6,20 +13,25 @@ provisioner:
name: chef_zero

platforms:
- name: ubuntu-14.04
- name: ubuntu-15.10
- name: ubuntu-16.10
- name: debian-8.6
- name: centos-7.2
- name: centos-6.7
- name: fedora-25
<% test_platforms.each do |plat_ver| %>
- name: <%= plat_ver %>
driver:
box_url: https://app.vagrantup.com/bento/<%= plat_ver %>
<% end %>

verifier:
name: inspec
inspec_tests:
- test/integration/inspec

suites:
- name: default
<% chef_versions.each do |version| %>
- name: default-chef<%= version %>
provisioner:
product_name: chef
product_version: <%= version %>
install_strategy: once
run_list:
- recipe[minitest-handler]
- recipe[terraform::default]
- name: gpgme
run_list:
- recipe[minitest-handler]
- recipe[terraform::gpgme]
<% end %>
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
inherit_from: .rubocop_todo.yml

AllCops:
TargetRubyVersion: 2.4
7 changes: 6 additions & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2017-01-03 09:49:16 -0800 using RuboCop version 0.46.0.
# on 2018-05-21 20:26:50 -0700 using RuboCop version 0.54.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand All @@ -9,3 +9,8 @@
# Offense count: 1
Metrics/AbcSize:
Max: 16

# Offense count: 2
# Configuration parameters: CountComments, ExcludedMethods.
Metrics/BlockLength:
Max: 53
3 changes: 2 additions & 1 deletion Berksfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

source 'https://supermarket.chef.io'

metadata
cookbook 'minitest-handler', '~> 1.5'
24 changes: 7 additions & 17 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
DEPENDENCIES
minitest-handler (~> 1.5)
terraform
path: .
metadata: true
Expand All @@ -9,23 +8,14 @@ GRAPH
build-essential (>= 0.0.0)
seven_zip (>= 0.0.0)
windows (>= 0.0.0)
build-essential (7.0.3)
compat_resource (>= 12.16.3)
build-essential (8.1.1)
mingw (>= 1.1)
seven_zip (>= 0.0.0)
chef_handler (2.1.0)
compat_resource (12.16.3)
mingw (1.2.5)
compat_resource (>= 12.16.3)
mingw (2.0.2)
seven_zip (>= 0.0.0)
minitest-handler (1.5.0)
chef_handler (>= 0.0.0)
ohai (4.2.3)
compat_resource (>= 12.14.7)
seven_zip (2.0.2)
windows (>= 1.2.2)
terraform (1.0.1)
seven_zip (3.0.0)
windows (>= 0.0.0)
terraform (2.0.0)
ark (~> 2.0)
build-essential (~> 7.0)
windows (2.1.1)
ohai (>= 4.0.0)
build-essential (~> 8.0)
windows (4.2.2)
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
terraform Cookbook CHANGELOG
============================

2.0.0
-----
- Now requires Chef 13 or newer
- Use vagrant images hosted at https://app.vagrantup.com/bento
- Added testing with Chef 13 and 14
- Ported minitests to Inspec
- Changed default terraform version to 0.11.7

1.0.2
-----
- (Grasshopper): updated build-essential version dependency
Expand Down
21 changes: 12 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
# frozen_string_literal: true

source 'https://rubygems.org'

gem 'berkshelf', '~> 5.2'
gem 'chef-dk', '~> 1.0'
gem 'chefspec', '~> 5.1.1'
gem 'foodcritic', '~> 7.1.0'
gem 'berkshelf', '~> 6.3.1'
gem 'chef-dk', '~> 2.4'
gem 'chefspec', '~> 7.1.0'
gem 'foodcritic', '~> 12.2.0'
gem 'gpgme', '~> 2.0.12'
gem 'rubocop', '~> 0.46'
gem 'stove', '~> 4.1'
gem 'kitchen-inspec', '~> 0.23.1'
gem 'kitchen-vagrant', '~> 1.3.2'
gem 'rubocop', '~> 0.54.0'
gem 'stove', '~> 6.0.0'
gem 'test-kitchen', '~> 1.20.0'

group :integration do
gem 'serverspec'
gem 'winrm', '~> 2.0'
gem 'winrm-fs', '~> 1.0.0'
gem 'serverspec', '~> 2.41.3'
end
Loading

0 comments on commit 63d257f

Please sign in to comment.