wombat-cli 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb1dde9cdeddd5be9adf57151011076989314185
-  data.tar.gz: 4e978f5f7614cf027d1253a8dca6af5a19718f9b
+  metadata.gz: 4813af6ebde7741373463711fe1de2c8d26ca338
+  data.tar.gz: 46c222e69a359a9fbd5ea212badbf3a474bfe0f1
 SHA512:
-  metadata.gz: f15e12d70edf2f52397b24a7d4d569fb8d8f49128df723d01681cbcc540a14852b19a3e60485ef6aa68b14f9111f403c11132760be0e36b27041c4605e4ea20c
-  data.tar.gz: a75640c06a484a88fb1f4b150d30c6d8d90d8f8df8d9b51d13edbfbc34dab03c7efb27e6303f9be4a2ea758bcd38010198d0cbc7b62c0f97cadf548977d82b63
+  metadata.gz: 9c9c77b5b678e92f7e259ff95e96e4307d0392c3d34e6d7c1622b6423683121fa0fab8137296c2f6c93359c6badb5b60cff45a7c9555546ce8a709b15e2ee8d3
+  data.tar.gz: dba71212dd430556d1a4375d177eecda28de86d0476c538c0e463fa25dc49b16c099cf8e4b70cc6bc2478d723ce375aa487cece244f109962f349f6e53ea328a

data/.gitignore

@@ -11,9 +11,13 @@ vendored-cookbooks
 cloudformation/*.json
 keys/*
 packer/keys/*
+generator_files/keys/*
 *.lock
 infranodes-info.json
 output
 bootstrap-aws.txt
 *.gem
 stacks/*
+.envrc
+.direnv
+.ruby-version

data/.travis.yml

@@ -0,0 +1,27 @@
+language: ruby
+cache: bundler
+
+sudo: false
+
+branches:
+  only:
+    - master
+
+before_install:
+  - gem update --system
+  - gem --version
+  - gem uninstall bundler -a -x -I
+  - rvm @global do gem uninstall bundler -a -x -I
+  - gem install bundler
+  - bundle --version
+  - rm -f .bundle/config
+rvm:
+  - 2.3.3
+  - 2.4.0
+  - ruby-head
+
+allow_failures:
+  - rvm: ruby-head
+
+script:
+  - bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [v0.4.0](https://github.com/chef-cft/wombat/tree/v0.4.0) (2017-02-10)
+[Full Changelog](https://github.com/chef-cft/wombat/compare/v0.3.4...v0.4.0)
+
+**Implemented enhancements:**
+- Decrease data\_collector timeout during build [\#262](https://github.com/chef-cft/wombat/issues/262)
+- Add new command`latest` for getting latest cloud images [\#289](https://github.com/chef-cft/wombat/pull/289) ([cheeseplus](https://github.com/cheeseplus))
+- add cli option, env variable, and default wombat.yml [\#266](https://github.com/chef-cft/wombat/pull/266) ([andrewelizondo](https://github.com/andrewelizondo))
+- Fixes for changed automate api [\#283](https://github.com/chef-cft/wombat/pull/283) ([binamov](https://github.com/binamov))
+- Re-enable .NET speed optimizations [\#264](https://github.com/chef-cft/wombat/pull/264) ([nweddle](https://github.com/nweddle))
+- Namespacing and spec tests [\#281](https://github.com/chef-cft/wombat/pull/281) ([cheeseplus](https://github.com/cheeseplus))
+- Implement TravisCI [\#290](https://github.com/chef-cft/wombat/pull/290) ([cheeseplus](https://github.com/cheeseplus))
+- Refactor how source\_ami/image work [\#288](https://github.com/chef-cft/wombat/pull/288) ([cheeseplus](https://github.com/cheeseplus))
+- Lots of Azure support work by ([russellseymour](https://github.com/russellseymour))
+
 ## [v0.3.4](https://github.com/chef-cft/wombat/tree/v0.3.4) (2016-12-07)
 [Full Changelog](https://github.com/chef-cft/wombat/compare/v0.3.3...v0.3.4)
 
@@ -35,4 +49,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "chefstyle"
+gem "rspec"

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/wombat-cli.svg)](http://badge.fury.io/rb/wombat-cli)
-
+[![Build Status](https://travis-ci.org/chef-cft/wombat.svg?branch=master)](https://travis-ci.org/chef-cft/wombat)
 [![Stories in Ready](https://badge.waffle.io/chef-cft/wombat.png?label=ready&title=Ready)](https://waffle.io/chef-cft/wombat)
 
 # Wombat
@@ -26,7 +26,7 @@ Follow the instructions at https://docs.chef.io/install_dk.html to install and c
 
 ##### Install Packer
 
-Downloads are here: https://www.packer.io/downloads.html. The binary must be in $PATH for `wombat build` 
+Downloads are here: https://www.packer.io/downloads.html. The binary must be in $PATH for `wombat build`
 
 ##### Download your Automate license key
 Automate requires a valid license to activate successfully. **If you do

data/Rakefile

@@ -1 +1,26 @@
 require 'bundler/gem_tasks'
+
+begin
+  require "rspec/core/rake_task"
+
+  RSpec::Core::RakeTask.new do |t|
+    t.pattern = "spec/**/*_spec.rb"
+  end
+rescue LoadError
+  desc "rspec is not installed, this task is disabled"
+  task :spec do
+    abort "rspec is not installed. `(sudo) gem install rspec` to run unit tests"
+  end
+end
+
+task :default => :spec
+
+begin
+  require "chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:style) do |task|
+    task.options += ["--display-cop-names", "--no-color"]
+  end
+rescue LoadError
+  puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
+end

data/bin/wombat

@@ -17,7 +17,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w[.. lib])
 require "wombat/cli"
 
 begin
-  Runner.new(Options.parse(ARGV)).start
+  Wombat::Runner.new(Wombat::Options.parse(ARGV)).start
 rescue => ex
   $stderr.puts ">>> #{ex.message}"
   exit(($? && $?.exitstatus) || 99)

data/generator_files/cookbooks/automate/metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'you@example.com'
 license 'all_rights'
 description 'Installs/Configures automate'
 long_description 'Installs/Configures automate'
-version '0.2.0'
+version '0.2.1'
 
 depends 'chef-ingredient'
 depends 'line'

data/generator_files/cookbooks/automate/recipes/update-users.rb

@@ -34,7 +34,7 @@ ruby_block "Create Delivery Users" do
 
       # Set Password
       if info['password']
-        delivery_api.post("/internal-users/#{username}/reset-password", { "password" => info['password'] })
+        delivery_api.post("/internal-users/#{username}/change-password", { "password" => info['password'] })
       end
     end
   end

data/generator_files/cookbooks/chef_server/recipes/default.rb

@@ -35,20 +35,26 @@ end
 end
 
 chef_ingredient 'chef-server' do
+  action [ :install, :reconfigure ]
   channel node['demo']['versions']['chef-server'].split('-')[0].to_sym
   version node['demo']['versions']['chef-server'].split('-')[1]
+  config <<-EOH
+api_fqdn 'chef.#{node['demo']['domain']}'
+data_collector['root_url'] = 'https://#{node['demo']['domain_prefix']}automate.#{node['demo']['domain']}/data-collector/v0/'
+data_collector['token'] = "#{node['demo']['data_collector_token']}"
+profiles["root_url"] = "https://#{node['demo']['domain_prefix']}automate.#{node['demo']['domain']}"
+EOH
 end
 
-chef_ingredient 'chef-server' do
-  action :reconfigure
-  config <<-EOH
-  api_fqdn 'chef.#{node['demo']['domain']}'
-  data_collector['root_url'] = 'https://#{node['demo']['domain_prefix']}automate.#{node['demo']['domain']}/data-collector/v0/'
-  data_collector['token'] = "#{node['demo']['data_collector_token']}"
-  profiles["root_url"] = "https://#{node['demo']['domain_prefix']}automate.#{node['demo']['domain']}"
-  EOH
+# Temporarily reduced timeout to speed up the build.
+append_if_no_line "Append a 1ms timeout for the data collector" do
+  path "/etc/opscode/chef-server.rb"
+  line "data_collector['timeout'] = '1'"
 end
 
+# Use an execute block so we don't revert the config.
+execute 'chef-server-ctl reconfigure'
+
 if node['platform'] == 'centos'
   # hardcoding this one as other permutations are known broken
   filename = 'opscode-push-jobs-server-1.1.6-1.x86_64.rpm'
@@ -83,9 +89,8 @@ chef_ingredient 'manage' do
   action  :install
 end
 
-chef_ingredient 'chef-server' do
-  action :reconfigure
-end
+# Another execute block. Keep our temp config until we finish.
+execute 'chef-server-ctl reconfigure'
 
 chef_ingredient 'manage' do
   accept_license true
@@ -94,7 +99,15 @@ end
 
 include_recipe 'chef_server::bootstrap_users'
 
+# Temporary timeout no longer required. We can return to defaults now.
+delete_lines "Remove the data_collector timeout before we finish." do
+  path "/etc/opscode/chef-server.rb"
+  pattern "^.*data_collector.*timeout.*"
+  notifies :reconfigure, 'chef_ingredient[chef-server]', :immediately
+end
+
 delete_lines "Remove temporary hostfile entry we added earlier" do
   path "/etc/hosts"
   pattern "^#{node['ipaddress']}.*#{node['demo']['domain_prefix']}chef\.#{node['demo']['domain']}.*chef"
 end
+

data/generator_files/cookbooks/workstation/.kitchen.ec2.yml

@@ -16,13 +16,14 @@ provisioner:
 platforms:
   - name: windows-2012r2
     driver:
-      image_id: ami-1719f677
+      image_id: ami-1c7ad77c
     transport:
       ssh_key: <%= ENV["EC2_SSH_KEY_PATH"] %>
 
 suites:
   - name: default
     run_list:
+      - recipe[mock_data]
       - recipe[workstation]
 
 verifier:

data/generator_files/cookbooks/workstation/metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'cheeseplus@chef.io'
 license 'Apache 2.0'
 description 'Configures a Windows workstation'
 long_description 'Configures a Windows workstation'
-version '0.2.4'
+version '0.2.6'
 supports 'windows'
 
 depends 'chocolatey'

data/generator_files/cookbooks/workstation/recipes/default.rb

@@ -17,5 +17,4 @@ include_recipe 'workstation::editor'
 include_recipe 'workstation::chef'
 include_recipe 'workstation::profile'
 include_recipe 'wombat::etc-hosts'
-# disable while we figure out why this broke
-# include_recipe 'workstation::dotnet'
+include_recipe 'workstation::dotnet'

data/generator_files/cookbooks/workstation/templates/default/ise_profile.ps1.erb

@@ -1,5 +1,5 @@
-# Load posh-git example profile
-. '<%= @home %>\Documents\WindowsPowerShell\Modules\posh-git\profile.example.ps1'
+# Load posh-git
+Import-Module posh-git
 
 # Load PSReadline
 Import-Module PSReadLine

data/generator_files/cookbooks/workstation/test/integration/default/workstation_spec.rb

@@ -28,10 +28,10 @@ describe command('choco list -l git-credential-manager-for-windows') do
   its(:stdout) { should match(/1 packages installed\./) }
 end
 
-describe command('choco list -l visualstudiocode') do
-  its(:stdout) { should match(/1 packages installed\./) }
+describe command('Get-Module -ListAvailable -Name posh-git') do
+  its(:stdout) { should match(/Script     0.7.0      posh-git/) }
 end
 
-describe command('choco list -l poshgit') do
-  its(:stdout) { should match(/1 packages installed\./) }
+describe file('C:\Users\Administrator\Documents\WindowsPowerShell\Microsoft.PowerShell_profile.ps1') do
+  its('content') { should match(/Import-Module posh-git/) }
 end

data/generator_files/packer/automate.json

@@ -1,110 +1,132 @@
 {
-  "variables": {
-    "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}",
-    "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}",
-    "aws_region": "{{env `AWS_REGION`}}",
-    "aws_source_ami": "ami-8e0b9499",
-    "azure_client_id": "{{env `AZURE_CLIENT_ID`}}",
-    "azure_tenant_id": "{{env `AZURE_TENANT_ID`}}",
-    "azure_client_secret": "{{env `AZURE_CLIENT_SECRET`}}",
-    "azure_subscription_id": "{{env `AZURE_SUBSCRIPTION_ID`}}",
-    "azure_storage_account": "{{env `AZURE_STORAGE_ACCOUNT`}}",
-    "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
-    "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
-    "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
-    "gce_zone": "{{env `GCE_ZONE`}}",
-    "gce_source_image": "ubuntu-1404-trusty-v20160809a",
-    "build-nodes": "1",
-    "chef_channel": "stable",
-    "chef_install_url": "curl -L https://omnitruck.chef.io/install.sh",
-    "chef_ver": "latest",
-    "chefdk": "stable-latest",
-    "automate": "stable-latest",
-    "domain": "animals.biz",
-    "domain_prefix": "",
-    "enterprise": "mammals",
-    "org": "marsupials",
-    "workstations": "1",
-    "ssh_username": "ubuntu"
-  },
-
-  "builders": [
-    { "type": "amazon-ebs",
-      "access_key": "{{user `aws_access_key`}}",
-      "secret_key": "{{user `aws_secret_key`}}",
-      "region": "{{user `aws_region`}}",
-      "source_ami": "{{user `aws_source_ami`}}",
-      "instance_type": "t2.medium",
-      "communicator": "ssh",
-      "associate_public_ip_address": true,
-      "ssh_private_ip": false,
-      "ssh_username": "{{user `ssh_username`}}",
-      "ssh_pty" : true,
-      "ami_name": "automate-{{timestamp}}"
+    "variables": {
+        "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}",
+        "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}",
+        "aws_region": "{{env `AWS_REGION`}}",
+        "aws_source_ami": "ami-8e0b9499",
+        "azure_client_id": "{{env `AZURE_CLIENT_ID`}}",
+        "azure_tenant_id": "{{env `AZURE_TENANT_ID`}}",
+        "azure_client_secret": "{{env `AZURE_CLIENT_SECRET`}}",
+        "azure_subscription_id": "{{env `AZURE_SUBSCRIPTION_ID`}}",
+        "azure_storage_account": "{{env `AZURE_STORAGE_ACCOUNT`}}",
+        "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
+        "azure_object_id": "{{env `AZURE_OBJECT_ID`}}",
+        "azure_location": "",
+        "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
+        "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
+        "gce_zone": "{{env `GCE_ZONE`}}",
+        "gce_source_image": "ubuntu-1404-trusty-v20160809a",
+        "build-nodes": "1",
+        "chef_channel": "stable",
+        "chef_install_url": "curl -L https://omnitruck.chef.io/install.sh",
+        "chef_ver": "latest",
+        "chefdk": "stable-latest",
+        "automate": "stable-latest",
+        "domain": "animals.biz",
+        "domain_prefix": "",
+        "enterprise": "mammals",
+        "org": "marsupials",
+        "workstations": "1",
+        "ssh_username": "ubuntu"
     },
-    {
-      "type": "azure-arm",
-      "client_id": "{{user `azure_client_id`}}",
-      "client_secret": "{{user `azure_client_secret`}}",
-      "resource_group_name": "{{user `azure_resource_group`}}",
-      "storage_account": "{{user `azure_storage_account`}}",
-      "subscription_id": "{{user `azure_subscription_id`}}",
-      "tenant_id": "{{user `azure_tenant_id`}}",
-      "capture_container_name": "images",
-      "capture_name_prefix": "automate",
-      "image_publisher": "Canonical",
-      "image_offer": "UbuntuServer",
-      "image_sku": "14.04.3-LTS",
-      "location": "West US",
-      "vm_size": "Standard_D3_V2",
-      "os_type": "Linux"
-    },
-    {
-      "type": "googlecompute",
-      "account_file": "{{user `gce_account_file`}}",
-      "project_id": "{{user `gce_project_id`}}",
-      "source_image": "{{user `gce_source_image`}}",
-      "zone": "{{user `gce_zone`}}",
-      "disk_type": "pd-ssd",
-      "disk_size": "80",
-      "image_name": "automate-{{timestamp}}",
-      "machine_type": "n1-standard-2",
-      "ssh_username": "{{user `ssh_username`}}",
-      "ssh_pty" : true
-    }
-  ],
-
-  "provisioners" : [
-    {
-      "type": "file",
-      "source": "{{template_dir}}/files/",
-      "destination": "/tmp"
-    },
-    {
-      "type": "file",
-      "source": "{{pwd}}/keys/",
-      "destination": "/tmp"
-    },
-    {
-      "type": "chef-solo",
-      "install_command": "{{user `chef_install_url`}} | sudo bash -s -- -c {{user `chef_channel`}} -v {{user `chef_ver`}}",
-      "cookbook_paths": [ "{{pwd}}/vendored-cookbooks/automate" ],
-      "run_list": [ "automate", "wombat::authorized-keys", "wombat::etc-hosts" ],
-      "json": {
-        "demo": {
-          "admin-user": "{{user `ssh_username`}}",
-          "domain_prefix": "{{user `domain_prefix`}}",
-          "domain": "{{user `domain`}}",
-          "enterprise": "{{user `enterprise`}}",
-          "org": "{{user `org`}}",
-          "build-nodes": "{{user `build-nodes`}}",
-          "workstations":  "{{user `workstations`}}",
-          "versions": {
-            "chefdk": "{{user `chefdk`}}",
-            "automate": "{{user `automate`}}"
-          }
+    "builders": [
+        {
+            "type": "amazon-ebs",
+            "access_key": "{{user `aws_access_key`}}",
+            "secret_key": "{{user `aws_secret_key`}}",
+            "region": "{{user `aws_region`}}",
+            "source_ami": "{{user `aws_source_ami`}}",
+            "instance_type": "m4.large",
+            "communicator": "ssh",
+            "associate_public_ip_address": true,
+            "ssh_private_ip": false,
+            "ssh_username": "{{user `ssh_username`}}",
+            "ssh_pty": true,
+            "ami_name": "automate-{{timestamp}}"
+        },
+        {
+            "type": "azure-arm",
+            "subscription_id": "{{user `azure_subscription_id`}}",
+            "client_id": "{{user `azure_client_id`}}",
+            "client_secret": "{{user `azure_client_secret`}}",
+            "tenant_id": "{{user `azure_tenant_id`}}",
+            "resource_group_name": "{{user `azure_resource_group`}}",
+            "storage_account": "{{user `azure_storage_account`}}",
+            "object_id": "{{user `azure_object_id`}}",
+            "capture_container_name": "images",
+            "capture_name_prefix": "automate",
+            "os_type": "Linux",
+            "image_publisher": "Canonical",
+            "image_offer": "UbuntuServer",
+            "image_sku": "14.04.5-LTS",
+            "location": "{{user `azure_location`}}",
+            "vm_size": "Standard_DS3_v2",
+            "ssh_username": "{{user `ssh_username`}}",
+            "ssh_pty": true
+        },
+        {
+            "type": "googlecompute",
+            "account_file": "{{user `gce_account_file`}}",
+            "project_id": "{{user `gce_project_id`}}",
+            "source_image": "{{user `gce_source_image`}}",
+            "zone": "{{user `gce_zone`}}",
+            "disk_type": "pd-ssd",
+            "disk_size": "80",
+            "image_name": "automate-{{timestamp}}",
+            "machine_type": "n1-standard-2",
+            "ssh_username": "{{user `ssh_username`}}",
+            "ssh_pty": true
+        }
+    ],
+    "provisioners": [
+        {
+            "type": "file",
+            "source": "{{pwd}}/files/",
+            "destination": "/tmp"
+        },
+        {
+            "type": "file",
+            "source": "{{pwd}}/keys/",
+            "destination": "/tmp"
+        },
+        {
+            "type": "chef-solo",
+            "install_command": "{{user `chef_install_url`}} | sudo bash -s -- -c {{user `chef_channel`}} -v {{user `chef_ver`}}",
+            "cookbook_paths": [
+                "{{pwd}}/vendored-cookbooks/automate"
+            ],
+            "run_list": [
+                "automate",
+                "wombat::authorized-keys",
+                "wombat::etc-hosts"
+            ],
+            "json": {
+                "demo": {
+                    "admin-user": "{{user `ssh_username`}}",
+                    "domain_prefix": "{{user `domain_prefix`}}",
+                    "domain": "{{user `domain`}}",
+                    "enterprise": "{{user `enterprise`}}",
+                    "org": "{{user `org`}}",
+                    "build-nodes": "{{user `build-nodes`}}",
+                    "workstations": "{{user `workstations`}}",
+                    "versions": {
+                        "chefdk": "{{user `chefdk`}}",
+                        "automate": "{{user `automate`}}"
+                    }
+                }
+            }
+        },
+        {
+            "only": [
+                "azure-arm"
+            ],
+            "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} sudo -E sh '{{ .Path }}'",
+            "inline": [
+                "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
+            ],
+            "inline_shebang": "/bin/sh -x",
+            "type": "shell",
+            "skip_clean": true
         }
-      }
-    }
-  ]
-}
+    ]
+}