sambot 0.1.213 → 0.1.214

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b0b31feb12f1eec5396f1a2791a54d9babbf9c
-  data.tar.gz: 71dd1d30db522ec8ef0e49ac69352cf0e10d66de
+  metadata.gz: 3f2ae76a337fbddc024b5f4726e2475573fd7175
+  data.tar.gz: d676602ea84c172e479f693266ba273dbe622ce1
 SHA512:
-  metadata.gz: d2eaef4a93835ce8c4194a7611628375428578b83455b68ca3a4cd971b5f4cf25af5e75dc879723d9bc7892eb032b9f572c2baf611f084ccfee00dd6a2765061
-  data.tar.gz: 7eb99d5c944baa51653bfe8ccff70cd1efc8f50c36a6dfae150cda1e702d67c638471e29fc4ca98989ba40c7b135fe8453619e9921e910494fbc47da7f74018f
+  metadata.gz: 61c6cabe142666ba50b0f531a8816a3219dd42f158777fc15327bee8ad3cdd2c9b1293e46a09434fc513325f996ea0d1af5e52b984014f1bd64869d1891efdad
+  data.tar.gz: 831de4e46b42c972f85706a15475b7218d48e1ec2a5f1c84917e8eace5f6b4999e852b98b3be540677d8e63bbf59fb92448c469a3b66a71b2c0fdab1a4b9975f

data/lib/sambot.rb

@@ -13,7 +13,6 @@ require_relative 'sambot/version'
 require_relative 'sambot/template'
 require_relative 'sambot/fs'
 require_relative 'sambot/source_control'
-require_relative 'sambot/team_city'
 
 require_relative 'sambot/testing/consul_helper'
 require_relative 'sambot/testing/vault_helper'
@@ -28,7 +27,13 @@ require_relative 'sambot/chef/generator'
 require_relative 'sambot/chef/roles'
 
 require_relative 'sambot/tasks/create'
-
+require_relative 'sambot/tasks/verify'
+require_relative 'sambot/tasks/build'
+require_relative 'sambot/tasks/version'
+require_relative 'sambot/tasks/up'
+require_relative 'sambot/tasks/down'
+require_relative 'sambot/tasks/populate'
+require_relative 'sambot/tasks/test'
 require_relative 'sambot/cli'
 
 require_relative 'sambot/teamcity/faraday'

data/lib/sambot/chef/cookbook.rb

@@ -59,7 +59,7 @@ module Sambot
 
         def create_files(config)
           ['README.md'].each { |resource| FS.copy(resource) unless FS.exist?(resource) }
-          %w[spec test attributes local_testing].each { |resource| FS.mkdir(resource) unless FS.exist?(resource) }
+          %w[spec test attributes].each { |resource| FS.mkdir(resource) unless FS.exist?(resource) }
           Dir.chdir('attributes') { FileUtils.touch('default.rb') unless FS.exist?('default.rb') }
           Dir.chdir('spec') { FS.copy('spec_helper.rb') unless FS.exist?('spec_helper.rb') }
           %w[recipes libraries resources files templates].each { |target| FS.mkdir(target) unless FS.exist?(target) }

data/lib/sambot/chef/roles.rb

@@ -43,7 +43,7 @@ module Sambot
 
         def apply_changes(contents, repository, file)
           puts 'Not stubbed'
-          exit
+          raise 'error'
           msg = "Updated cookbook dependency #{dependency_name} to #{version}"
           SourceControl.edit_file(ROLE_COOKBOOK_ORGANIZATION, repository, COOKBOOK_CONFIG, contents, file, msg)
           return true

data/lib/sambot/cli.rb

@@ -7,120 +7,46 @@ module Sambot
 
     desc 'checkout', 'Checks out or updates all the repositories in a given organization'
     def checkout(organization, dir)
-      Dir.chdir(dir) do
-        SourceControl.checkout(organization)
+      execute do
+        Dir.chdir(dir) do
+          SourceControl.checkout(organization)
+        end
       end
     end
 
     desc 'clean', 'Remove all generated build files from a Chef cookbook'
-    def clean
-      execute { Chef::Cookbook.clean }
-    end
+    def clean; execute { Chef::Cookbook.clean } end
 
     desc 'up', 'Setup the Docker environment for testing cookbooks'
-    def up
-      execute do
-        unless File.exist?('docker-compose.yml')
-          UI.error("This command should only be run in a cookbook directory. Make sure you have run `chef exec sambot build --local --docker` before trying again.")
-          exit 1
-        end
-        up_cmd
-        populate_cmd
-      end
-    end
+    def up; execute { Sambot::Tasks::Up.new.run(options) } end
 
     desc 'down', 'Destroy the Docker environment for testing cookbooks'
-    def down
-      execute do
-        down_cmd
-      end
-    end
+    def down; execute { Sambot::Tasks::Down.new.run(options) } end
 
     desc 'test', 'Test a cookbook using the Docker environment'
-    def test
-      execute do
-        up_cmd
-        populate_cmd
-        down_cmd
-      end
-    end
+    def test; execute { Sambot::Tasks::Test.new.run(options) } end
 
     desc 'populate', 'Populates Vault and Consul with seed data'
-    def populate
-      execute do
-        populate_cmd
-      end
-    end
+    def populate; execute { Sambot::Tasks::Populate.new.run(options)  } end
 
     desc 'bump', 'Bump the patch version of a cookbook'
-    def bump
-      execute { Chef::Cookbook.bump }
-    end
+    def bump; execute { Chef::Cookbook.bump } end
 
     desc 'build', 'Builds a Chef cookbook from its configuration file'
     option :local, type: :boolean
     option :google, type: :boolean
     option :rackspace, type: :boolean
     option :docker, type: :boolean
-    def build
-      execute do
-        cloud = nil
-        cloud = 'local' if options[:local]
-        cloud = 'google' if options[:google]
-        cloud = 'rackspace' if options[:rackspace]
-        unless cloud
-          UI.error('Please select which environment this is building for using one of the following flags: --local, --rackspace or --google')
-          exit
-        end
-        local_workflow = options[:docker] ? 'docker' : 'vagrant'
-        Chef::Cookbook.build(Config.read, cloud, local_workflow)
-      end
-    end
+    def build; execute { Sambot::Tasks::Build.new.run(options) } end
 
     desc 'create', 'Creates a new Chef cookbook'
-    def create
-      execute do
-        Sambot::Tasks::Create.new.run
-      end
-    end
+    def create; execute { Sambot::Tasks::Create.new.run(options) } end
 
     desc 'version', 'Gives the cookbook version as a TeamCity service message'
-    def version
-      execute { puts "##teamcity[buildNumber '#{Config.read.version}']" }
-    end
-
-    desc 'pin', 'Goes through role cookbooks and updates a wrapper cookbook version'
-    def pin
-    end
-
-    desc 'verify', 'Ensures all supporting resources i.e. cookbook structure, TeamCity build and Git repository are created'
-    def verify
-      # Check in cookbook directory
-      # Check for .config.yml - if not present, raise error
-      # Get name from .config.yml
-      # Check Github repository exists, if not ask to create it
-      # Check TeamCity build configuration exists, if not ask to create it
-      # Add deploy key to Vault and TeamCity Server
-    end
-
-    no_commands do
+    def version; execute { Sambot::Tasks::Version.new.run(options) } end
 
-      def populate_cmd
-        Sambot::Testing::VaultHelper.setup
-        Sambot::Testing::VaultHelper.load_secrets(Config.read)
-        Sambot::Testing::ConsulHelper.load_values(Config.read)
-      end
-
-      def down_cmd
-        `docker-compose -p local down`
-        `docker-compose -p local rm -sf`
-      end
-
-      def up_cmd
-        `docker-compose -p local up -d`
-      end
-
-    end
+    desc 'verify', 'Ensures all supporting resources i.e. TeamCity build and Git repository are created and the git origin is pointing to the correct URL'
+    def verify; execute { Sambot::Tasks::Verify.new.run(options) } end
 
   end
 end

data/lib/sambot/source_control.rb

@@ -11,19 +11,48 @@ module Sambot
 
       ET_GITHUB_API = 'https://github.exacttarget.com/api/v3'
       ET_GITHUB = 'https://github.exacttarget.com'
+      ET_GITHUB_HOST = 'github.exacttarget.com'
+      WRAPPER_COOKBOOKS = 'ads-wrapper-cookbooks'
+      ROLE_COOKBOOKS = 'ads-role-cookbooks'
 
-      def create_repository(name, organization = nil)
-        # Need to check whether repo already exists first and do nothing if yes
-        api.repos.create "name": name, org: organization,
-            "private": false,
-            "has_issues": true,
-            "has_wiki": false,
-            "has_downloads": true
+      def set_git_remote(config)
+        target = identify_repository(config)
+        cmd = "git remote set-url origin git@#{ET_GITHUB_HOST}:#{target[:organization]}/#{target[:name]}"
+        UI.info("Running the following command: #{cmd}")
+        `#{cmd}`
       end
 
-      def delete_repository(user, repo)
-        # Need to check whether repo exists first
-        api.repos.delete user, repo
+      def add_deploy_key(config)
+        # Create deploy key
+        # Add it to Vault
+        # Run Chef-Client against TeamCity
+      end
+
+      def create_repository(config)
+        target = identify_repository(config)
+        if api.repos.get user: target[:organization], repo: target[:name]
+          UI.info("The repository #{target[:organization]}/#{target[:name]} exists and will not be recreated")
+          return 1
+        else
+          api.repos.create "name": target[:name], org: target[:organization],
+              "private": false,
+              "has_issues": true,
+              "has_wiki": false,
+              "has_downloads": true
+            UI.info("The repository #{target[:organization]}/#{target[:name]} has been created")
+          return 0
+        end
+      end
+
+      def delete_repository(config)
+        target = identify_repository(config)
+        if api.repos.get "#{target[:organization]}/#{target[:name]}"
+          UI.info("The repository #{target[:organization]}/#{arget[:name]} does not exist and will not be deleted")
+          return 1
+        else
+          api.repos.delete organization, repo
+          return 0
+        end
       end
 
       def checkout(organization)
@@ -58,6 +87,13 @@ module Sambot
 
       private
 
+      def identify_repository(config)
+        {
+          name: config.name,
+          organization: config.is_role_cookbook? ? ROLE_COOKBOOKS : WRAPPER_COOKBOOKS
+        }
+      end
+
       def contents_api
         api.repos.contents
       end

data/lib/sambot/tasks/build.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative '../base_command'
+
+module Sambot
+  module Tasks
+    class Build < BaseCommand
+
+      no_commands do
+
+        def run(options)
+          cloud = nil
+          cloud = 'local' if options[:local]
+          cloud = 'google' if options[:google]
+          cloud = 'rackspace' if options[:rackspace]
+          unless cloud
+            UI.error('Please select which environment this is building for using one of the following flags: --local, --rackspace or --google')
+            exit
+          end
+          local_workflow = options[:docker] ? 'docker' : 'vagrant'
+          Chef::Cookbook.build(Config.read, cloud, local_workflow)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/tasks/check.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative '../base_command'
+
+module Sambot
+  module Tasks
+    class Check < BaseCommand
+
+      no_commands do
+
+        def run(directory, options)
+          # For each directory
+            # If a wrapper cookbook
+              # Check if a .config.yml file is present
+              # Check if the .config.yml file correctly points to inspec/tests
+              # Check if inspec tests controls inspec.yml and controls folder
+              # Check if a build configuration is present in the correct location
+            # If a role cookbook
+              # Check if a .config.yml file is present
+              # Check as-dependencies and esure config.yml imports the compliance profiles
+              # Check if a build configuration is present in the correct location
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/tasks/create.rb

@@ -18,7 +18,7 @@ module Sambot
 
       no_commands do
 
-        def run
+        def run(options)
           opts = {
             'name' => ask(NAME_REQUEST),
             'platforms' => ask(PLATFORM_REQUEST, limited_to: PLATFORM_OPTIONS),

data/lib/sambot/tasks/down.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative '../base_command'
+
+module Sambot
+  module Tasks
+    class Down < BaseCommand
+
+      no_commands do
+
+        def run(options)
+          `docker-compose -p local down`
+          `docker-compose -p local rm -sf`
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/tasks/populate.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../base_command'
+
+module Sambot
+  module Tasks
+    class Populate < BaseCommand
+
+      no_commands do
+
+        def run(options)
+          Sambot::Testing::VaultHelper.setup
+          Sambot::Testing::VaultHelper.load_secrets(Config.read)
+          Sambot::Testing::ConsulHelper.load_values(Config.read)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/tasks/test.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../base_command'
+
+module Sambot
+  module Tasks
+    class Test < BaseCommand
+
+      no_commands do
+
+        def run(options)
+          Sambot::Tasks::Up.new.run(options)
+          `chef exec kitchen test`
+          Sambot::Tasks::Down.new.run(options)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/tasks/up.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative '../base_command'
+
+module Sambot
+  module Tasks
+    class Up < BaseCommand
+
+      no_commands do
+
+        def run(options)
+          unless File.exist?('docker-compose.yml')
+            UI.error("This command should only be run in a cookbook directory. Make sure you have run `chef exec sambot build --local --docker` before trying again.")
+            exit 1
+          end
+          `docker-compose -p local up -d`
+          Sambot::Tasks::Populate.new.run(options)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/tasks/verify.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative '../base_command'
+
+module Sambot
+  module Tasks
+    class Verify < BaseCommand
+
+      no_commands do
+
+        def run(options)
+          check_configuration
+          config = Config.read
+          ::TeamCity.create_cookbook_build(config)
+          ::Sambot::SourceControl.create_repository(config)
+          ::Sambot::SourceControl.set_git_remote(config)
+          ::Sambot::SourceControl.add_deploy_key(config)
+        end
+
+        def check_configuration
+          unless ENV['TEAMCITY_USERNAME']
+            UI.error("Please ensure the TEAMCITY_USERNAME environment variable is set before running this command")
+            exit
+          end
+          unless ENV['TEAMCITY_PASSWORD']
+            UI.error("Please ensure the TEAMCITY_USERNAME environment variable is set before running this command")
+            exit
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/tasks/version.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative '../base_command'
+
+module Sambot
+  module Tasks
+    class Version < BaseCommand
+
+      no_commands do
+
+        def run(options)
+          puts "##teamcity[buildNumber '#{Config.read.version}']"
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/teamcity/builds.rb

@@ -2,6 +2,10 @@ module TeamCity
   class Client
     module Builds
 
+      LINUX_WRAPPER_COOKBOOKS_PROJECT = 'Wrapper Cookbooks - GCP'
+      LINUX_ROLE_COOKBOOKS_PROJECT = 'Role Cookbooks - GCP'
+      GCP_PROJECT = 'Google Cloud Platform'
+
       def attach_template(build_id, template_id)
         path = "buildTypes/#{build_id}/template"
         put(path, :content_type => :text) do |request|
@@ -17,19 +21,32 @@ module TeamCity
          end
       end
 
+      def build_exists?(project, build_name)
+        all_builds = TeamCity.project_buildtypes(id: project.id).map {|x| x.name}
+        all_builds.include?(build_name)
+      end
+
       def create_cookbook_build(config)
         ::TeamCity.configure do |config|
           config.endpoint = 'https://teamcity.brighter.io/httpAuth/app/rest' || ENV['TEAMCITY_URL']
           config.http_user = ENV['TEAMCITY_USERNAME']
           config.http_password = ENV['TEAMCITY_PASSWORD']
         end
-        # Identify which projects this cookbook belongs to (ROLE OR WRAPPER)
-        # Create a build configuration for it
-        project = ::TeamCity.find_project_by_name(LINUX_ROLES_PROJECT_NAME)
-        template = ::TeamCity.project_templates(id: project.id)[0]
-        build_configuration = ::TeamCity.create_build(project.id, name)
-        ::TeamCity.attach_template(build_configuration.id, template.id)
-        ::TeamCity.delete_buildtype(build_configuration.id)
+        project_name = config.is_role_cookbook? ? LINUX_ROLE_COOKBOOKS_PROJECT : LINUX_WRAPPER_COOKBOOKS_PROJECT
+        ::Sambot::UI.debug("Looking for the project #{project_name}")
+        project = ::TeamCity.find_project_by_name(project_name)
+        if build_exists?(project, config.name)
+          ::Sambot::UI.info("The build configuration '#{config.name}' already exists in the project '#{project.name}'")
+        else
+          ::Sambot::UI.debug("Looking for the template project #{GCP_PROJECT}")
+          template_project = ::TeamCity.find_project_by_name(GCP_PROJECT)
+          template = ::TeamCity.project_templates(id: template_project.id)[0]
+          ::Sambot::UI.debug("Using the TeamCity template #{template.name}")
+          build_configuration = ::TeamCity.create_build(project.id, config.name)
+          ::TeamCity.attach_template(build_configuration.id, template.id)
+          ::Sambot::UI.info("The build configuration '#{config.name}' has been created in the project '#{project.name}'")
+          build_configuration
+        end
       end
 
     end

data/lib/sambot/teamcity/faraday.rb

@@ -17,7 +17,7 @@ module TeamCity
         connection.use FaradayMiddleware::Mashify
         connection.use FaradayMiddleware::ParseJson if headers.accept =~ /json/
         connection.use FaradayMiddleware::NullResponseBody
-        connection.use Faraday::Response::Logger
+        #connection.use Faraday::Response::Logger
         connection.adapter(adapter)
         connection.basic_auth(http_user, http_password)
       end

data/lib/sambot/templates/git_hooks/pre-commit

@@ -1,8 +1,3 @@
 #!/bin/sh
 chef exec sambot bump
 git add .config.yml
-if [ -d 'inspec' ]; then
-  inspec archive inspec/tests --overwrite
-  mv *-profile-*.tar.gz inspec/archives
-  git add inspec/archives
-fi

data/lib/sambot/testing/vault_helper.rb

@@ -13,16 +13,25 @@ module Sambot
         VAULT_CONFIG_BINARY = 'vault-config'
         WORKING_DIR = '/tmp/sambot/testing/vault'
         VAULT_POLICIES_REPO = 'git@github.exacttarget.com:ads-devops/vault-policies.git'
+        VAULT_ADDRESS = 'http://127.0.0.1:8200'
+        BOOTSTRAP_TOKEN_ROLE = 'nightswatch-ro'
+        BOOTSTRAP_TOKEN_TTL = '72h'
+        BOOTSTRAP_TOKEN = 'root'
+        BOOTSTRAP_TOKEN_POLICIES = ['nightswatch-ro']
 
-        def generate_wrapped_token
+        def configure
           ::Vault.configure do |config|
-            config.address = 'http://127.0.0.1:8200'
-            config.token = 'root'
+            config.address = VAULT_ADDRESS
+            config.token = BOOTSTRAP_TOKEN
             config.ssl_verify = false
           end
+        end
+
+        def generate_wrapped_token
+          configure
           token = ''
           begin
-            wrap_info = Vault.auth_token.create('wrap_ttl': '72h', role: 'nightswatch-ro', policies: ['nightswatch-ro']).wrap_info
+            wrap_info = Vault.auth_token.create('wrap_ttl': BOOTSTRAP_TOKEN_TTL, role: BOOTSTRAP_TOKEN_ROLE, policies: BOOTSTRAP_TOKEN_POLICIES).wrap_info
             token = wrap_info.token
           rescue
           end
@@ -39,7 +48,7 @@ module Sambot
             Dir.chdir 'vault-policies/dev/vault-config' do
               FS.copy(VAULT_CONFIG_BINARY)
               UI.info('Applying the Vault policies')
-              `VC_VAULT_ADDR=http://127.0.0.1:8200 VC_VAULT_TOKEN=root ./#{VAULT_CONFIG_BINARY} config`
+              `VC_VAULT_ADDR=#{VAULT_ADDRESS} VC_VAULT_TOKEN=#{BOOTSTRAP_TOKEN} ./#{VAULT_CONFIG_BINARY} config`
               UI.info('The Vault policies have been applied')
             end
           end
@@ -79,6 +88,7 @@ module Sambot
         end
 
         def write_to_vault(path, key, value)
+          configure
           Vault.logical.write(path, key.to_sym => value)
         end
 

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.213'
+  VERSION = '0.1.214'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.213
+  version: 0.1.214
 platform: ruby
 authors:
 - Olivier Kouame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor-hollaback
@@ -415,8 +415,15 @@ files:
 - lib/sambot/fs.rb
 - lib/sambot/runtime.rb
 - lib/sambot/source_control.rb
+- lib/sambot/tasks/build.rb
+- lib/sambot/tasks/check.rb
 - lib/sambot/tasks/create.rb
-- lib/sambot/team_city.rb
+- lib/sambot/tasks/down.rb
+- lib/sambot/tasks/populate.rb
+- lib/sambot/tasks/test.rb
+- lib/sambot/tasks/up.rb
+- lib/sambot/tasks/verify.rb
+- lib/sambot/tasks/version.rb
 - lib/sambot/teamcity/builds.rb
 - lib/sambot/teamcity/faraday.rb
 - lib/sambot/teamcity/projects.rb

data/lib/sambot/team_city.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'pry'
-require 'github_api'
-require 'git'
-
-module Sambot
-  class TeamCity
-
-    class << self
-
-
-    end
-
-  end
-end