sambot 0.1.212 → 0.1.213

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d50132a71162661d13b1ed378127edf1e58fa099
-  data.tar.gz: ebd3d955a88ad71015706814e4e9e846c1813c6b
+  metadata.gz: c9b0b31feb12f1eec5396f1a2791a54d9babbf9c
+  data.tar.gz: 71dd1d30db522ec8ef0e49ac69352cf0e10d66de
 SHA512:
-  metadata.gz: dbef3dfd7a84847112f1f5e254f22e1f7a77b8cec223570525140635634f18d51f7315551c89edac2d471378ca008e81a82d3a0f439dc583343e583dfab8364f
-  data.tar.gz: 3283faefd74d4953b6cb7bcf7cbbd7f2f74042b33e775c2ac8c5be860c1bc054e8b4ad040e18f98c8f144442ad22ccce568db42dc7d97f704d5dd876cd74451d
+  metadata.gz: d2eaef4a93835ce8c4194a7611628375428578b83455b68ca3a4cd971b5f4cf25af5e75dc879723d9bc7892eb032b9f572c2baf611f084ccfee00dd6a2765061
+  data.tar.gz: 7eb99d5c944baa51653bfe8ccff70cd1efc8f50c36a6dfae150cda1e702d67c638471e29fc4ca98989ba40c7b135fe8453619e9921e910494fbc47da7f74018f

data/lib/sambot.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require 'thor'
+require 'teamcity'
+require 'awesome_print'
+require 'pry'
 
 require_relative 'sambot/application_error'
 require_relative 'sambot/config'
@@ -10,6 +13,7 @@ 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'
@@ -27,5 +31,9 @@ require_relative 'sambot/tasks/create'
 
 require_relative 'sambot/cli'
 
+require_relative 'sambot/teamcity/faraday'
+require_relative 'sambot/teamcity/projects'
+require_relative 'sambot/teamcity/builds'
+
 module Sambot
 end

data/lib/sambot/teamcity/builds.rb

@@ -0,0 +1,37 @@
+module TeamCity
+  class Client
+    module Builds
+
+      def attach_template(build_id, template_id)
+        path = "buildTypes/#{build_id}/template"
+        put(path, :content_type => :text) do |request|
+          request.body = template_id
+        end
+      end
+
+      def create_build(project_id, name)
+         path = "projects/#{project_id}/buildTypes"
+         payload = { name: name }
+         post(path, :content_type => :json, :accept => :json) do |request|
+           request.body = payload.to_json
+         end
+      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)
+      end
+
+    end
+   end
+ end

data/lib/sambot/teamcity/faraday.rb

@@ -0,0 +1,26 @@
+module TeamCity
+  module Connection
+
+    private
+
+    def connection(options={})
+
+      faraday_options = {
+        :headers => {
+          'User-Agent' => user_agent
+        }.merge((headers = Headers.build(options)).to_hash),
+        :ssl => {:verify => false},
+        :url => endpoint
+      }
+      Faraday::Connection.new(faraday_options) do |connection|
+        connection.use Faraday::Request::UrlEncoded
+        connection.use FaradayMiddleware::Mashify
+        connection.use FaradayMiddleware::ParseJson if headers.accept =~ /json/
+        connection.use FaradayMiddleware::NullResponseBody
+        connection.use Faraday::Response::Logger
+        connection.adapter(adapter)
+        connection.basic_auth(http_user, http_password)
+      end
+    end
+  end
+end

data/lib/sambot/teamcity/projects.rb

@@ -0,0 +1,21 @@
+module TeamCity
+  class Client
+
+    module Projects
+
+      def find_project_by_name(name)
+        projects = ::TeamCity.projects
+        projects.find { |project| project.name.match(name) }
+      end
+
+      def project_templates(options)
+        assert_options(options)
+        request = "projects/#{locator(options)}/templates"
+        response = get(request)
+        response['buildType']
+      end
+
+    end
+
+  end
+end

data/lib/sambot/templates/teamcity.sh.erb

@@ -9,28 +9,16 @@ chef exec berks update
 chef exec rspec spec --col
 set +e
 
-<% if ENV['TEST_KITCHEN_ACTION'] == 'converge' %>
-  chef exec kitchen converge <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-<% elsif ENV['TEST_KITCHEN_ACTION'] == 'create' %>
-  chef exec kitchen create <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-<% elsif ENV['TEST_KITCHEN_ACTION'] == 'multi-step-test' %>
-  chef exec kitchen converge <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-  chef exec kitchen verify <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-  chef exec kitchen destroy <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-<% else %>
-<% unless ENV['SKIP_TESTING_AS_EMERGENCY'] %>
-  chef exec kitchen create <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-  sleep 45
-  chef exec kitchen verify <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-  RETVAL=$?
-  if [ $RETVAL -eq 0 ] ; then
-    chef exec kitchen destroy <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-    echo "Test Kitchen converged and all tests passed - Ready to upload to server"
-    exit $RETVAL
-  elif [ $RETVAL -ne 0 ] ; then
-    echo "Test Kitchen failed - cleaning up"
-    kitchen destroy <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
-    exit $RETVAL
-  fi
-  <% end %>
-<% end %>
+chef exec kitchen create -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
+sleep 45
+chef exec kitchen verify -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
+RETVAL=$?
+if [ $RETVAL -eq 0 ] ; then
+  chef exec kitchen destroy -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
+  echo "Test Kitchen converged and all tests passed - Ready to upload to server"
+  exit $RETVAL
+elif [ $RETVAL -ne 0 ] ; then
+  echo "Test Kitchen failed - cleaning up"
+  kitchen destroy -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
+  exit $RETVAL
+fi

data/lib/sambot/templates/test_kitchen/google.yml.erb

@@ -24,7 +24,7 @@ platforms:
       preemptible: true
       service_account_name: <%= ENV['GCP_SERVICE_ACCOUNT_NAME'] %>
       custom_metadata_from_disk:
-        startup-script: <%= ENV['GCP_BOOTSTRAP_SCRIPT_CENTOS'] %>
+        startup-script: bootstrap.sh
       service_account_scopes:
         - userinfo-email
         - logging-write
@@ -54,7 +54,7 @@ platforms:
       disk_size: 80
       service_account_name: <%= ENV['GCP_SERVICE_ACCOUNT_NAME'] %>
       custom_metadata_from_disk:
-        windows-startup-script: <%= ENV['GCP_BOOTSTRAP_SCRIPT_WINDOWS'] %>
+        windows-startup-script: bootstrap.ps1
       service_account_scopes:
         - userinfo-email
         - logging-write

data/lib/sambot/version.rb

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

data/sambot.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'vault'
   spec.add_dependency 'ridley'
   spec.add_dependency 'titan'
+  spec.add_dependency 'teamcity-ruby-client'
   spec.add_dependency 'open4'
   spec.add_dependency 'diplomat'
   spec.add_dependency 'semantic'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.212
+  version: 0.1.213
 platform: ruby
 authors:
 - Olivier Kouame
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: teamcity-ruby-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -403,6 +417,9 @@ files:
 - lib/sambot/source_control.rb
 - lib/sambot/tasks/create.rb
 - lib/sambot/team_city.rb
+- lib/sambot/teamcity/builds.rb
+- lib/sambot/teamcity/faraday.rb
+- lib/sambot/teamcity/projects.rb
 - lib/sambot/template.rb
 - lib/sambot/templates/.config.yml.erb
 - lib/sambot/templates/.env