Skip to content

Commit 59b7898

Browse files
LevonBeckerLevonBecker
authored
v3.0.3 (#18)
* Improved kitchen config * Removed env var defaults from kitchen config. If at a place where that makes since then can add, otherwise it's just confusing when you're missing an env var and it bombs with an odd error. This way it will be in your face that it's looking for an env var that is missing. * Updated Amazon Linux 1/2 AMI to latest * Updated Ubuntu 16/18 AMI to latest * Added Ubuntu 20.04 AMI
1 parent 2537c18 commit 59b7898

File tree

6 files changed

+140
-53
lines changed

6 files changed

+140
-53
lines changed

‎.kitchen.yml‎

Lines changed: 122 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,104 +9,184 @@ platforms:
99
# AWS AMI/EC2 Platforms
1010
- name: amazon-linux1-ami
1111
driver:
12-
associate_public_ip: <%= ENV.fetch('AWS_PUBLIC_IP', 'false') %>
13-
aws_ssh_key_id: <%= ENV.fetch('AWS_SSH_KEY_ID', 'bonusbits_dev_key') %>
14-
iam_profile_name: <%= ENV.fetch('AWS_IAM_INSTANCE_PROFILE_LNX', 'Linux-Instance_Role') %>
12+
associate_public_ip: <%= ENV['AWS_PUBLIC_IP'] %>
13+
aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] %>
14+
iam_profile_name: <%= ENV['AWS_IAM_INSTANCE_PROFILE_1'] %>
1515
image_search:
1616
owner-id: 137112412989
17-
name: amzn-ami-hvm-2018.03.0.20190826-x86_64-gp2
17+
name: amzn-ami-hvm-2018.03.0.20210721.0-x86_64-gp2
1818
instance_initiated_shutdown_behavior: terminate
19-
instance_type: t3.micro
19+
instance_type: t3.small
2020
name: ec2
21-
region: <%= ENV.fetch('AWS_REGION', 'us-west-2') %>
21+
region: <%= ENV['AWS_REGION'] %>
2222
security_group_ids:
23-
- <%= ENV.fetch('AWS_SECURITY_GROUP_lnx_1', 'sg-00000000') %>
24-
- <%= ENV.fetch('AWS_SECURITY_GROUP_lnx_2', 'sg-00000000') %>
25-
subnet_id: <%= ENV.fetch('AWS_SUBNET_ID', 'subnet-00000000') %>
23+
- <%= ENV['AWS_SECURITY_GROUP_1'] %>
24+
<% if ENV['AWS_SECURITY_GROUP_2'] %>
25+
- <%= ENV['AWS_SECURITY_GROUP_2'] %>
26+
<% end %>
27+
<% if ENV['AWS_SECURITY_GROUP_3'] %>
28+
- <%= ENV['AWS_SECURITY_GROUP_3'] %>
29+
<% end %>
30+
<% if ENV['AWS_SECURITY_GROUP_4'] %>
31+
- <%= ENV['AWS_SECURITY_GROUP_4'] %>
32+
<% end %>
33+
<% if ENV['AWS_SECURITY_GROUP_5'] %>
34+
- <%= ENV['AWS_SECURITY_GROUP_5'] %>
35+
<% end %>
36+
subnet_id: <%= ENV['AWS_SUBNET_ID'] %>
2637
tags:
2738
Created-By: Test Kitchen
2839
OS: Amazon v1
2940
Owner: *aws_tag_owner
3041
# user_data: *bootstrap_lnx
31-
vpc_id: <%= ENV.fetch('AWS_VPC_ID', 'vpc-00000000') %>
42+
vpc_id: <%= ENV['AWS_VPC_ID'] %>
3243
transport:
3344
username: ec2-user
34-
ssh_key: <%= ENV.fetch('AWS_SSH_KEY_PATH', ENV['HOME'] + "/.ssh/bonusbits_dev_key.pem") %>
45+
ssh_key: <%= ENV['AWS_SSH_KEY_PATH'] %>
3546
- name: amazon-linux2-ami
3647
driver:
37-
associate_public_ip: <%= ENV.fetch('AWS_PUBLIC_IP', 'false') %>
38-
aws_ssh_key_id: <%= ENV.fetch('AWS_SSH_KEY_ID', 'bonusbits_dev_key') %>
39-
iam_profile_name: <%= ENV.fetch('AWS_IAM_INSTANCE_PROFILE_LNX', 'Linux-Instance_Role') %>
48+
associate_public_ip: <%= ENV['AWS_PUBLIC_IP'] %>
49+
aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] %>
50+
iam_profile_name: <%= ENV['AWS_IAM_INSTANCE_PROFILE_1'] %>
4051
image_search:
4152
owner-id: 137112412989
42-
name: amzn2-ami-hvm-2.0.20190823.1-x86_64-gp2
53+
name: amzn2-ami-hvm-2.0.20210813.1-x86_64-gp2
4354
instance_initiated_shutdown_behavior: terminate
44-
instance_type: t3.micro
55+
instance_type: t3.small
4556
name: ec2
46-
region: <%= ENV.fetch('AWS_REGION', 'us-west-2') %>
57+
region: <%= ENV['AWS_REGION'] %>
4758
security_group_ids:
48-
- <%= ENV.fetch('AWS_SECURITY_GROUP_lnx_1', 'sg-00000000') %>
49-
- <%= ENV.fetch('AWS_SECURITY_GROUP_lnx_2', 'sg-00000000') %>
50-
subnet_id: <%= ENV.fetch('AWS_SUBNET_ID', 'subnet-00000000') %>
59+
- <%= ENV['AWS_SECURITY_GROUP_1'] %>
60+
<% if ENV['AWS_SECURITY_GROUP_2'] %>
61+
- <%= ENV['AWS_SECURITY_GROUP_2'] %>
62+
<% end %>
63+
<% if ENV['AWS_SECURITY_GROUP_3'] %>
64+
- <%= ENV['AWS_SECURITY_GROUP_3'] %>
65+
<% end %>
66+
<% if ENV['AWS_SECURITY_GROUP_4'] %>
67+
- <%= ENV['AWS_SECURITY_GROUP_4'] %>
68+
<% end %>
69+
<% if ENV['AWS_SECURITY_GROUP_5'] %>
70+
- <%= ENV['AWS_SECURITY_GROUP_5'] %>
71+
<% end %>
72+
subnet_id: <%= ENV['AWS_SUBNET_ID'] %>
5173
tags:
5274
Created-By: Test Kitchen
5375
OS: Amazon v2
5476
Owner: *aws_tag_owner
5577
# user_data: *bootstrap_lnx
56-
vpc_id: <%= ENV.fetch('AWS_VPC_ID', 'vpc-00000000') %>
78+
vpc_id: <%= ENV['AWS_VPC_ID'] %>
5779
transport:
5880
username: ec2-user
59-
ssh_key: <%= ENV.fetch('AWS_SSH_KEY_PATH', ENV['HOME'] + "/.ssh/bonusbits_dev_key.pem") %>
81+
ssh_key: <%= ENV['AWS_SSH_KEY_PATH'] %>
6082
- name: ubuntu-1604-ami
6183
driver:
62-
associate_public_ip: <%= ENV.fetch('AWS_PUBLIC_IP', 'false') %>
63-
aws_ssh_key_id: <%= ENV.fetch('AWS_SSH_KEY_ID', 'bonusbits_dev_key') %>
64-
iam_profile_name: <%= ENV.fetch('AWS_IAM_INSTANCE_PROFILE_LNX', 'Linux-Instance_Role') %>
84+
associate_public_ip: <%= ENV['AWS_PUBLIC_IP'] %>
85+
aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] %>
86+
iam_profile_name: <%= ENV['AWS_IAM_INSTANCE_PROFILE_1'] %>
6587
image_search:
6688
owner-id: 099720109477
67-
name: ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20190913
89+
name: ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20210928
6890
instance_initiated_shutdown_behavior: terminate
6991
instance_type: t3.micro
7092
name: ec2
71-
region: <%= ENV.fetch('AWS_REGION', 'us-west-2') %>
93+
region: <%= ENV['AWS_REGION'] %>
7294
security_group_ids:
73-
- <%= ENV.fetch('AWS_SECURITY_GROUP_lnx_1', 'sg-00000000') %>
74-
- <%= ENV.fetch('AWS_SECURITY_GROUP_lnx_2', 'sg-00000000') %>
75-
subnet_id: <%= ENV.fetch('AWS_SUBNET_ID', 'subnet-00000000') %>
95+
- <%= ENV['AWS_SECURITY_GROUP_1'] %>
96+
<% if ENV['AWS_SECURITY_GROUP_2'] %>
97+
- <%= ENV['AWS_SECURITY_GROUP_2'] %>
98+
<% end %>
99+
<% if ENV['AWS_SECURITY_GROUP_3'] %>
100+
- <%= ENV['AWS_SECURITY_GROUP_3'] %>
101+
<% end %>
102+
<% if ENV['AWS_SECURITY_GROUP_4'] %>
103+
- <%= ENV['AWS_SECURITY_GROUP_4'] %>
104+
<% end %>
105+
<% if ENV['AWS_SECURITY_GROUP_5'] %>
106+
- <%= ENV['AWS_SECURITY_GROUP_5'] %>
107+
<% end %>
108+
subnet_id: <%= ENV['AWS_SUBNET_ID'] %>
76109
tags:
77110
Created-By: Test Kitchen
78111
OS: Ubuntu 16.04 LTS
79112
Owner: *aws_tag_owner
80113
# user_data: *bootstrap_lnx
81-
vpc_id: <%= ENV.fetch('AWS_VPC_ID', 'vpc-00000000') %>
114+
vpc_id: ENV['AWS_VPC_ID'] %>
82115
transport:
83116
username: ubuntu
84-
ssh_key: <%= ENV.fetch('AWS_SSH_KEY_PATH', ENV['HOME'] + "/.ssh/bonusbits_dev_key.pem") %>
117+
ssh_key: <%= ENV['AWS_SSH_KEY_PATH'] %>
85118
- name: ubuntu-1804-ami
86119
driver:
87-
associate_public_ip: <%= ENV.fetch('AWS_PUBLIC_IP', 'false') %>
88-
aws_ssh_key_id: <%= ENV.fetch('AWS_SSH_KEY_ID', 'bonusbits_dev_key') %>
89-
iam_profile_name: <%= ENV.fetch('AWS_IAM_INSTANCE_PROFILE_LNX', 'Linux-Instance_Role') %>
120+
associate_public_ip: <%= ENV['AWS_PUBLIC_IP'] %>
121+
aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] %>
122+
iam_profile_name: <%= ENV['AWS_IAM_INSTANCE_PROFILE_1'] %>
123+
image_search:
124+
owner-id: 099720109477
125+
name: ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20210907
126+
instance_initiated_shutdown_behavior: terminate
127+
instance_type: t3.micro
128+
name: ec2
129+
region: <%= ENV['AWS_REGION'] %>
130+
security_group_ids:
131+
- <%= ENV['AWS_SECURITY_GROUP_1'] %>
132+
<% if ENV['AWS_SECURITY_GROUP_2'] %>
133+
- <%= ENV['AWS_SECURITY_GROUP_2'] %>
134+
<% end %>
135+
<% if ENV['AWS_SECURITY_GROUP_3'] %>
136+
- <%= ENV['AWS_SECURITY_GROUP_3'] %>
137+
<% end %>
138+
<% if ENV['AWS_SECURITY_GROUP_4'] %>
139+
- <%= ENV['AWS_SECURITY_GROUP_4'] %>
140+
<% end %>
141+
<% if ENV['AWS_SECURITY_GROUP_5'] %>
142+
- <%= ENV['AWS_SECURITY_GROUP_5'] %>
143+
<% end %>
144+
subnet_id: <%= ENV['AWS_SUBNET_ID'] %>
145+
tags:
146+
Created-By: Test Kitchen
147+
OS: Ubuntu 18.04 LTS
148+
Owner: *aws_tag_owner
149+
# user_data: *bootstrap_lnx
150+
vpc_id: <%= ENV['AWS_VPC_ID'] %>
151+
transport:
152+
username: ubuntu
153+
ssh_key: <%= ENV['AWS_SSH_KEY_PATH'] %>
154+
- name: ubuntu-2004-ami
155+
driver:
156+
associate_public_ip: <%= ENV['AWS_PUBLIC_IP'] %>
157+
aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] %>
158+
iam_profile_name: <%= ENV['AWS_IAM_INSTANCE_PROFILE_1'] %>
90159
image_search:
91160
owner-id: 099720109477
92-
name: ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20191002
161+
name: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001
93162
instance_initiated_shutdown_behavior: terminate
94163
instance_type: t3.micro
95164
name: ec2
96-
region: <%= ENV.fetch('AWS_REGION', 'us-west-2') %>
165+
region: <%= ENV['AWS_REGION'] %>
97166
security_group_ids:
98-
- <%= ENV.fetch('AWS_SECURITY_GROUP_lnx_1', 'sg-00000000') %>
99-
- <%= ENV.fetch('AWS_SECURITY_GROUP_lnx_2', 'sg-00000000') %>
100-
subnet_id: <%= ENV.fetch('AWS_SUBNET_ID', 'subnet-00000000') %>
167+
- <%= ENV['AWS_SECURITY_GROUP_1'] %>
168+
<% if ENV['AWS_SECURITY_GROUP_2'] %>
169+
- <%= ENV['AWS_SECURITY_GROUP_2'] %>
170+
<% end %>
171+
<% if ENV['AWS_SECURITY_GROUP_3'] %>
172+
- <%= ENV['AWS_SECURITY_GROUP_3'] %>
173+
<% end %>
174+
<% if ENV['AWS_SECURITY_GROUP_4'] %>
175+
- <%= ENV['AWS_SECURITY_GROUP_4'] %>
176+
<% end %>
177+
<% if ENV['AWS_SECURITY_GROUP_5'] %>
178+
- <%= ENV['AWS_SECURITY_GROUP_5'] %>
179+
<% end %>
180+
subnet_id: <%= ENV['AWS_SUBNET_ID'] %>
101181
tags:
102182
Created-By: Test Kitchen
103183
OS: Ubuntu 18.04 LTS
104184
Owner: *aws_tag_owner
105185
# user_data: *bootstrap_lnx
106-
vpc_id: <%= ENV.fetch('AWS_VPC_ID', 'vpc-00000000') %>
186+
vpc_id: <%= ENV['AWS_VPC_ID'] %>
107187
transport:
108188
username: ubuntu
109-
ssh_key: <%= ENV.fetch('AWS_SSH_KEY_PATH', ENV['HOME'] + "/.ssh/bonusbits_dev_key.pem") %>
189+
ssh_key: <%= ENV['AWS_SSH_KEY_PATH'] %>
110190

111191
# Docker Platforms
112192
- name: amazon-linux1-docker

‎Berksfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ DEPENDENCIES
44
metadata: true
55

66
GRAPH
7-
apt (7.2.0)
8-
audit (9.0.1)
7+
apt (7.4.0)
8+
audit (9.5.0)
99
bonusbits_base (3.0.2)
1010
apt (>= 0.0.0)
1111
audit (>= 0.0.0)
1212
selinux (>= 0.0.0)
13-
selinux (3.0.1)
13+
selinux (6.0.0)

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
## CHANGE LOG
22

3+
## 3.0.3 - 10/04/2020 - Levon Becker
4+
* Improved kitchen config
5+
* Removed env var defaults from kitchen config. If at a place where that makes since then can add, otherwise it's just confusing when you're missing an env var and it bombs with an odd error. This way it will be in your face that it's looking for an env var that is missing.
6+
* Updated Amazon Linux 1/2 AMI to latest
7+
* Updated Ubuntu 16/18 AMI to latest
8+
* Added Ubuntu 20.04 AMI
9+
310
## 3.0.2 - 03/19/2020 - Levon Becker
411
* Renamed inspec_bonusbits_base repo to bonusbits_base_inspec in github. So, needed to updated audit and kitchen config
512
* Moved todo list to TODO.md

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 Bonus Bits
3+
Copyright (c) 2021 Bonus Bits
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Bonus Bits Base Cookbook
2-
[![Project Release](https://img.shields.io/badge/release-v3.0.2-blue.svg)](https://github.com/bonusbits/bonusbits_base)
2+
[![Project Release](https://img.shields.io/badge/release-v3.0.3-blue.svg)](https://github.com/bonusbits/bonusbits_base)
33
[![Circle CI](https://circleci.com/gh/bonusbits/bonusbits_base/tree/master.svg?style=shield)](https://circleci.com/gh/bonusbits/bonusbits_base/tree/master)
44
[![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)
55
[![GitHub issues](https://img.shields.io/github/issues/bonusbits/bonusbits_base.svg)](https://github.com/bonusbits/bonusbits_base/issues)
@@ -107,12 +107,12 @@ Basically copy/paste, instead of converting YAML to JSON... I've done it for you
107107
```
108108
test
109109
├── data_bags
110-
│   ├── encrypted_data_bag_secret
111-
│   └── bonusbits_base
112-
│   ├── credentials.json
113-
│   └── enterprise_ca.json
110+
│ ├── encrypted_data_bag_secret
111+
│ └── bonusbits_base
112+
│ ├── credentials.json
113+
│ └── enterprise_ca.json
114114
├── environments
115-
│   └── bonusbits_base.json
115+
│ └── bonusbits_base.json
116116
└── node
117117
└── client.rb
118118
└── roles

‎metadata.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
license 'MIT'
55
description 'Foundation Wrapper Cookbook for all Nodes'
66
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7-
version '3.0.2'
7+
version '3.0.3'
88
chef_version '~> 15.4' if respond_to?(:chef_version)
99
source_url 'https://github.com/bonusbits/bonusbits_base'
1010
issues_url 'https://github.com/bonusbits/bonusbits_base/issues'

0 commit comments

Comments
 (0)