concourse-deployer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25c2a4453ab7efcd1e0866deea1dff9ff2a343c7977e0ac62496409eeb8cf99e
-  data.tar.gz: d8400270b0a80d7238ecd774596c451cd6b4e8f0f88e5ad44f7f6f36eb2c5329
+  metadata.gz: 9961c750811bf5c2b0be8ccb7903655c1597f00ad643c74b2a2b470a03cb2afc
+  data.tar.gz: 8e32bdeb837566cbc5478cc4c7c9464cd8edd1b6c68297e151828afe6c3df707
 SHA512:
-  metadata.gz: a2c7aa9c926366bca72b17d43184ca815cd4cfd23e642a7f87c033e61a4ba116d0d9647853713b45471944c3b09d2d156775f92ab61c1d4a2d55db4d3541aaa3
-  data.tar.gz: cd7b31dce5e2c977d503c4b36cba068536b622b618993ca26fd5b791b7848de298da05b342cd4134d12c42e3a6627b127ee8dfa77fecd15a43dfc207fa6ad547
+  metadata.gz: d8bb2e00967f3c3cbd284f35f34e6b59855c795916a6b85d581a42aca0448f494035bc5abb660e7edb7d11a251cc1de2212dc219fa32019e3c4afced43fb0563
+  data.tar.gz: 7457cb3e89f63f9b53b2afcbb98e08a70e7a7c936f98e86b0bb0acc76d9906249e9cc275ee0a36da4168b3185f4cad1f2f0fbace987a735a91971aac31663764

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog for `concourse-deployer`
 
+## v0.3.0 / 2019-02-16
+
+Features:
+
+- Upgrade concourse-bosh-deployment to a specific version.
+
+
 ## v0.2.0 / 2019-02-10
 
 Features:

data/lib/concourse/deployer.rb

@@ -12,16 +12,16 @@ module Concourse
     include Rake::DSL
     include Concourse::Deployer::Utils
 
-    GCP_SERVICE_ACCOUNT_FILE  = "service-account.key.json"
-    ENVRC_FILE                = ".envrc"
+    GCP_SERVICE_ACCOUNT_FILE = "service-account.key.json"
+    ENVRC_FILE = ".envrc"
 
-    BBL_STATE_FILE            = "bbl-state.json"
-    BBL_VARS_DIR              = "vars"
+    BBL_STATE_FILE = "bbl-state.json"
+    BBL_VARS_DIR = "vars"
 
-    BOSH_DEPLOYMENT           = "concourse"
-    BOSH_SECRETS              = "secrets.yml"
-    BOSH_VARS_STORE           = "cluster-creds.yml"
-    BOSH_OPERATIONS           = "operations.yml"
+    BOSH_DEPLOYMENT = "concourse"
+    BOSH_SECRETS = "secrets.yml"
+    BOSH_VARS_STORE = "cluster-creds.yml"
+    BOSH_OPERATIONS = "operations.yml"
 
     CONCOURSE_DEPLOYMENT_VARS = "deployment-vars.yml"
 
@@ -35,10 +35,10 @@ module Concourse
       return true unless File.exist?(GCP_SERVICE_ACCOUNT_FILE)
 
       overwrite = prompt "A #{GCP_SERVICE_ACCOUNT_FILE} file already exists. Do you want to overwrite it? (y/n)", "n"
-      return !! (overwrite =~ /^y/i)
+      return !!(overwrite =~ /^y/i)
     end
 
-    def bbl_gcp_init project_id
+    def bbl_gcp_init(project_id)
       bbl_init
       unless_which "gcloud", "https://cloud.google.com/sdk/downloads"
       ensure_in_gitcrypt GCP_SERVICE_ACCOUNT_FILE
@@ -57,7 +57,7 @@ module Concourse
     end
 
     def bbl_gcp_up
-      unless ENV['BBL_GCP_PROJECT_ID']
+      unless ENV["BBL_GCP_PROJECT_ID"]
         error "Environment variable BBL_GCP_PROJECT_ID is not set. Did you run `rake bbl:gcp:init` and `direnv allow`?"
       end
 
@@ -97,7 +97,7 @@ module Concourse
 
         v["postgres_client_cert"] = (v["postgres_client_cert"] || {}).tap do |cert|
           cert["certificate"] ||= prompt_for_file_contents "Path to client-cert.pem"
-          cert["private_key"] ||= prompt_for_file_contents "Path to client-key.pem" 
+          cert["private_key"] ||= prompt_for_file_contents "Path to client-key.pem"
         end
         v["postgres_ca_cert"] = (v["postgres_ca_cert"] || {}).tap do |cert|
           cert["certificate"] ||= prompt_for_file_contents "Path to server-ca.pem"
@@ -129,8 +129,9 @@ module Concourse
       end
     end
 
-    def bosh_update_concourse_deployment
-      update_git_submodule "https://github.com/concourse/concourse-bosh-deployment", "master"
+    def bosh_update_concourse_deployment(branch_or_tag)
+      branch_or_tag ||= "master"
+      ensure_git_submodule "https://github.com/concourse/concourse-bosh-deployment", branch_or_tag
     end
 
     def bosh_update_ubuntu_stemcell
@@ -155,7 +156,7 @@ module Concourse
     #   bosh_update_release "cloudfoundry-incubator/windows-utilities-release"
     # end
 
-    def bosh_deploy command: "deploy"
+    def bosh_deploy(command: "deploy")
       unless File.exists?(BOSH_SECRETS)
         error "File #{BOSH_SECRETS} does not exist. Please run `rake bosh:init` first."
       end
@@ -167,7 +168,7 @@ module Concourse
       ensure_in_gitcrypt BOSH_SECRETS
       ensure_in_gitcrypt BOSH_VARS_STORE
 
-      external_dns_name = bosh_secrets['external_dns_name']
+      external_dns_name = bosh_secrets["external_dns_name"]
       external_url = "https://#{external_dns_name}"
 
       ops_files = Dir[File.join(File.dirname(__FILE__), "deployer", "operations", "*.yml")]
@@ -212,15 +213,15 @@ module Concourse
       tempfile_key = Tempfile.new
       tempfile_ca = Tempfile.new
       begin
-        tempfile_cert.write bosh_secrets['postgres_client_cert']['certificate']
-        tempfile_key.write bosh_secrets['postgres_client_cert']['private_key']
-        tempfile_ca.write bosh_secrets['postgres_ca_cert']['certificate']
+        tempfile_cert.write bosh_secrets["postgres_client_cert"]["certificate"]
+        tempfile_key.write bosh_secrets["postgres_client_cert"]["private_key"]
+        tempfile_ca.write bosh_secrets["postgres_ca_cert"]["certificate"]
 
         tempfile_cert.close
         tempfile_key.close
         tempfile_ca.close
 
-        command = %Q{psql "sslmode=verify-ca sslrootcert=#{tempfile_ca.path} sslcert=#{tempfile_cert.path} sslkey=#{tempfile_key.path} hostaddr=#{bosh_secrets['postgres_host']} user=#{bosh_secrets['postgres_role']} dbname=atc"}
+        command = %Q{psql "sslmode=verify-ca sslrootcert=#{tempfile_ca.path} sslcert=#{tempfile_cert.path} sslkey=#{tempfile_key.path} hostaddr=#{bosh_secrets["postgres_host"]} user=#{bosh_secrets["postgres_role"]} dbname=atc"}
 
         sh command
       ensure
@@ -263,8 +264,8 @@ module Concourse
 
         namespace "update" do
           desc "update the git submodule for concourse-bosh-deployment"
-          task "concourse_deployment" do
-            bosh_update_concourse_deployment
+          task "concourse_deployment", ["branch_or_tag"] do |t, args|
+            bosh_update_concourse_deployment args["branch_or_tag"]
           end
 
           desc "upload ubuntu stemcell to the director"
@@ -272,25 +273,25 @@ module Concourse
             bosh_update_ubuntu_stemcell
           end
 
-#       desc "upload windows stemcell to the director"
-#       task "windows_stemcell" do
-#         bosh_update_windows_stemcell
-#       end
-
-#       desc "upload concourse windows release to the director"
-#       task "concourse_windows_release" do
-#         bosh_update_concourse_windows_release
-#       end
-
-#       desc "upload windows-ruby-dev-tools release to the director"
-#       task "windows_ruby_dev_tools" do
-#         bosh_update_windows_ruby_dev_tools
-#       end
-
-#       desc "upload windows-utilities release to the director"
-#       task "windows_utilities_release" do
-#         bosh_update_windows_utilities_release
-#       end
+          #       desc "upload windows stemcell to the director"
+          #       task "windows_stemcell" do
+          #         bosh_update_windows_stemcell
+          #       end
+
+          #       desc "upload concourse windows release to the director"
+          #       task "concourse_windows_release" do
+          #         bosh_update_concourse_windows_release
+          #       end
+
+          #       desc "upload windows-ruby-dev-tools release to the director"
+          #       task "windows_ruby_dev_tools" do
+          #         bosh_update_windows_ruby_dev_tools
+          #       end
+
+          #       desc "upload windows-utilities release to the director"
+          #       task "windows_utilities_release" do
+          #         bosh_update_windows_utilities_release
+          #       end
         end
 
         desc "deploy concourse"

data/lib/concourse/deployer/utils.rb

@@ -1,43 +1,43 @@
-require 'term/ansicolor'
+require "term/ansicolor"
 
 module Concourse
   class Deployer
     module Utils
       include Term::ANSIColor
 
-      GITIGNORE_FILE           = ".gitignore"
-      GITATTRIBUTES_FILE       = ".gitattributes"
+      GITIGNORE_FILE = ".gitignore"
+      GITATTRIBUTES_FILE = ".gitattributes"
 
-      def sh command
+      def sh(command)
         running "(in #{Dir.pwd}) #{command}"
         super command, verbose: false
       end
 
-      def running message
+      def running(message)
         print bold, red, "RUNNING: ", reset, message, "\n"
       end
 
-      def note message
+      def note(message)
         print bold, green, "NOTE: ", reset, message, "\n"
       end
 
-      def important message
+      def important(message)
         print bold, "NOTE: ", message, reset, "\n"
       end
 
-      def error message, continue=false
+      def error(message, continue = false)
         print red, bold, "ERROR: #{message}", reset, "\n"
         exit 1 unless continue
       end
 
-      def ensure_file filename, &block
+      def ensure_file(filename, &block)
         return if File.exist?(filename)
         File.open(filename, "w") do |f|
           block.call f
         end
       end
 
-      def ensure_in_gitignore file_glob
+      def ensure_in_gitignore(file_glob)
         if File.exist?(GITIGNORE_FILE)
           if File.read(GITIGNORE_FILE).split("\n").include?(file_glob)
             note "found '#{file_glob}' already present in #{GITIGNORE_FILE}"
@@ -48,7 +48,7 @@ module Concourse
         File.open(GITIGNORE_FILE, "a") { |f| f.puts file_glob }
       end
 
-      def ensure_in_gitcrypt file_glob
+      def ensure_in_gitcrypt(file_glob)
         crypt_entry = "#{file_glob} filter=git-crypt diff=git-crypt"
         if File.exist?(GITATTRIBUTES_FILE)
           if File.read(GITATTRIBUTES_FILE).split("\n").include?(crypt_entry)
@@ -60,7 +60,7 @@ module Concourse
         File.open(GITATTRIBUTES_FILE, "a") { |f| f.puts crypt_entry }
       end
 
-      def ensure_in_envrc entry_key, entry_value=nil
+      def ensure_in_envrc(entry_key, entry_value = nil)
         entries = if File.exist?(ENVRC_FILE)
                     File.read(ENVRC_FILE).split("\n")
                   else
@@ -108,30 +108,21 @@ module Concourse
         end
       end
 
-      def ensure_git_submodule repo_url, commitish
+      def ensure_git_submodule(repo_url, commitish)
         repo_name = File.basename repo_url
         sh "git submodule add '#{repo_url}'" unless Dir.exists?(repo_name)
-        Dir.chdir(repo_name) do
-          sh "git checkout '#{commitish}'"
-        end
-      end
-
-      def update_git_submodule repo_url, commitish
-        ensure_git_submodule repo_url, commitish
-
-        repo_name = File.basename repo_url
         Dir.chdir(repo_name) do
           sh "git remote update"
-          sh "git pull --rebase"
+          sh "git checkout '#{commitish}'"
         end
       end
 
-      def which command
+      def which(command)
         found = `which #{command}`
         return $?.success? ? found : nil
       end
 
-      def unless_which command, whereto
+      def unless_which(command, whereto)
         if which command
           note "found command '#{command}'"
           return
@@ -139,7 +130,7 @@ module Concourse
         error "please install '#{command}' by visiting #{whereto}"
       end
 
-      def prompt query, default=nil
+      def prompt(query, default = nil)
         loop do
           message = query
           message += " [#{default}]" if default
@@ -155,7 +146,7 @@ module Concourse
         end
       end
 
-      def prompt_for_file_contents query
+      def prompt_for_file_contents(query)
         loop do
           path = prompt query
           return File.read(path) if File.exists?(path)
@@ -167,7 +158,7 @@ module Concourse
         `bbl lbs`.split(":").last.strip
       end
 
-      def bosh_secrets &block
+      def bosh_secrets(&block)
         vars = File.exists?(BOSH_SECRETS) ? YAML.load_file(BOSH_SECRETS) : {}
         return vars unless block_given?
 
@@ -176,7 +167,7 @@ module Concourse
         vars
       end
 
-      def bosh_update_stemcell name
+      def bosh_update_stemcell(name)
         doc = Nokogiri::XML(open("https://bosh.io/stemcells/#{name}"))
         url = doc.at_xpath("//a[contains(text(), 'Light Stemcell')]/@href")
         if url.nil?
@@ -185,7 +176,7 @@ module Concourse
         sh "bosh upload-stemcell #{url}"
       end
 
-      def bosh_update_release repo
+      def bosh_update_release(repo)
         doc = Nokogiri::XML(open("https://bosh.io/releases/github.com/#{repo}?all=1"))
         url = doc.at_xpath("//a[contains(text(), 'Release Tarball')]/@href")
         if url.nil?
@@ -197,7 +188,7 @@ module Concourse
         sh "bosh upload-release #{url}"
       end
 
-      def bosh_update_from_git_repo git
+      def bosh_update_from_git_repo(git)
         dirname = File.basename(git)
         Dir.mktmpdir do |dir|
           Dir.chdir dir do

data/lib/concourse/deployer/version.rb

@@ -1,5 +1,5 @@
 module Concourse
   class Deployer
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concourse-deployer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mike Dalessio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor