bosh-workspace 0.7.0 → 0.8.0

data/lib/bosh/workspace/helpers/release_helper.rb

@@ -0,0 +1,33 @@
+module Bosh::Workspace
+  module ReleaseHelper
+    include ProjectDeploymentHelper
+
+    def release_uploaded?(name, version)
+      remote_release = director.get_release(name) rescue nil
+      remote_release && remote_release["versions"].include?(version.to_s)
+    end
+
+    def release_upload(manifest_file)
+      release_cmd.upload(manifest_file)
+    end
+
+    def releases_dir
+      @releases_dir ||= begin
+        FileUtils.mkdir_p(File.join(work_dir, ".releases")).first
+      end
+    end
+
+    def project_deployment_releases
+      @releases ||= begin
+        project_deployment.releases.map { |r| Release.new(r, releases_dir) }
+      end
+    end
+
+    private
+
+    def release_cmd
+      @release_cmd ||= Bosh::Cli::Command::Release.new
+    end
+  end
+end
+

data/lib/bosh/workspace/helpers/spiff_helper.rb

@@ -1,4 +1,4 @@
-module Bosh::Manifests
+module Bosh::Workspace
   module SpiffHelper
     include Bosh::Exec
 

data/lib/bosh/workspace/helpers/stemcell_helper.rb

@@ -0,0 +1,45 @@
+module Bosh::Workspace
+  module StemcellHelper
+    include ProjectDeploymentHelper
+
+    def stemcell_download(stemcell_name)
+      Dir.chdir(stemcells_dir) do
+        say "Downloading stemcell '#{stemcell_name}'"
+        nl
+        stemcell_cmd.download_public(stemcell_name)
+      end
+    end
+
+    def stemcell_upload(stemcell_file)
+      say "Uploading stemcell '#{File.basename(stemcell_file)}'"
+      nl
+      stemcell_cmd.upload(stemcell_file)
+    end
+
+    def stemcell_uploaded?(name, version)
+      existing = director.list_stemcells.select do |sc|
+        sc['name'] == name && sc['version'] == version.to_s
+      end
+
+      !existing.empty? 
+    end
+
+    def stemcells_dir
+      @stemcells_dir ||= begin
+        FileUtils.mkdir_p(File.join(work_dir, ".stemcells")).first
+      end
+    end
+
+    def project_deployment_stemcells
+      @stemcells ||= begin
+        project_deployment.stemcells.map { |s| Stemcell.new(s, stemcells_dir) }
+      end
+    end
+
+    private
+
+    def stemcell_cmd
+      @stemcell_cmd ||= Bosh::Cli::Command::Stemcell.new
+    end
+  end
+end

data/lib/bosh/workspace/manifest_builder.rb

@@ -1,19 +1,19 @@
-module Bosh::Manifests
+module Bosh::Workspace
   class ManifestBuilder
-    include Bosh::Manifests::SpiffHelper
+    include Bosh::Workspace::SpiffHelper
 
-    def self.build(manifest, work_dir)
-      manifest_builder = ManifestBuilder.new(manifest, work_dir)
+    def self.build(project_deployment, work_dir)
+      manifest_builder = ManifestBuilder.new(project_deployment, work_dir)
       manifest_builder.merge_templates
     end
 
-    def initialize(manifest, work_dir)
-      @manifest = manifest
+    def initialize(project_deployment, work_dir)
+      @project_deployment = project_deployment
       @work_dir = work_dir
     end
 
     def merge_templates
-      spiff_merge spiff_template_paths, @manifest.merged_file
+      spiff_merge spiff_template_paths, @project_deployment.merged_file
     end
 
     private
@@ -24,32 +24,17 @@ module Bosh::Manifests
     end
 
     def template_paths
-      @manifest.templates.map { |t| template_path(t) }
+      @project_deployment.templates.map { |t| template_path(t) }
     end
 
     def stub_file_path
       path = hidden_file_path(:stubs)
-      File.open(path, 'w') { |file| file.write(stub_file_content) }
+      StubFile.create(path, @project_deployment)
       path
     end
 
-    def stub_file_content
-      {
-        "director_uuid" => @manifest.director_uuid,
-        "releases" => filterd_releases,
-        "meta" => @manifest.meta
-      }.to_yaml
-    end
-
-    def filterd_releases
-      allowed_keys = %w[name version]
-      @manifest.releases.map do |release|
-        release.select { |key| allowed_keys.include?(key) }
-      end
-    end
-
     def hidden_file_path(type)
-      File.join(hidden_dir_path(type), "#{@manifest.name}.yml")
+      File.join(hidden_dir_path(type), "#{@project_deployment.name}.yml")
     end
 
     def hidden_dir_path(name)

data/lib/bosh/workspace/project_deployment.rb

@@ -0,0 +1,77 @@
+require "membrane"
+module Bosh::Workspace
+  class ProjectDeployment
+    include Bosh::Cli::Validation
+    attr_writer :director_uuid
+    attr_reader :file
+
+    RELEASE_SCHEMA = Membrane::SchemaParser.parse do
+      {
+        "name"    => String,
+        "version" => enum(Integer, "latest"),
+        "git"     => String,
+      }
+    end
+
+    STEMCELL_SCHEMA = Membrane::SchemaParser.parse do
+      {
+        "name"    => String,
+        "version" => enum(Integer, "latest"),
+      }
+    end
+
+    UUID_REGEX = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+
+    PROJECT_DEPLOYMENT_SCHEMA = Membrane::SchemaParser.parse do
+      {
+        "name"                  => String,
+        "director_uuid"         => enum(UUID_REGEX, "current"),
+        optional("domain_name") => String,
+        "releases"              => [RELEASE_SCHEMA],
+        "stemcells"             => [STEMCELL_SCHEMA],
+        "templates"             => [String],
+        "meta"                  => Hash
+      }
+    end
+
+    def initialize(file)
+      @file = file
+      err("Deployment file does not exist: #{file}") unless File.exist? @file
+      @manifest = Psych.load(File.read(@file))
+    end
+
+    def perform_validation(options = {})
+      PROJECT_DEPLOYMENT_SCHEMA.validate @manifest
+    rescue Membrane::SchemaValidationError => e
+      errors << e.message
+    end
+
+    def director_uuid
+      @director_uuid || @manifest["director_uuid"]
+    end
+
+    def merged_file
+      @merged_file ||= begin
+        path = File.join(file_dirname, "../.deployments", file_basename)
+        FileUtils.mkpath File.dirname(path)
+        File.expand_path path
+      end
+    end
+
+    %w[name templates releases stemcells meta domain_name].each do |var|
+      define_method var do
+        @manifest[var]
+      end
+    end
+
+    private
+
+    def file_basename
+      File.basename(@file)
+    end
+
+    def file_dirname
+      File.dirname(@file)
+    end
+  end
+end

data/lib/bosh/workspace/release.rb

@@ -1,58 +1,66 @@
 require "git"
-module Bosh::Manifests
+module Bosh::Workspace
   class Release
+    attr_reader :name, :git_uri, :repo_dir
+
     def initialize(release, releases_dir)
       @name = release["name"]
-      @version = release["version"]
+      @version_ref = release["version"]
       @git_uri = release["git"]
-      @work_dir = File.join(releases_dir)
+      @repo_dir = File.join(releases_dir, @name)
+      init_repo
     end
 
-    def checkout_current_version
-      repo.pull
-      repo.checkout(current_version_ref)
+    def update_repo
+      @repo.pull
+      @repo.checkout(ref)
     end
 
-    private
+    def manifest_file
+      File.join(repo_dir, manifest)
+    end
 
-    def repo
-      if File.directory?(repo_dir)
-        @repo ||= Git.open(repo_dir)
-      else
-        FileUtils.mkdir_p(@work_dir)
-        @repo = Git.clone(@git_uri, @name, path: @work_dir)
-      end
+    def manifest
+      final_releases[version]
     end
 
-    def current_version_ref
-      repo.log().object("releases/#{available_versions[current_version]}")
+    def name_version
+      "#{name}/#{version}"
     end
 
-    def current_version
-      if @version == "latest"
-        available_versions.keys.sort.last
-      else
-        version = @version.to_i
-        unless available_versions[version]
-          err("Could not find version: #{@version} for release: #{@name}")
-        end
-        version
+    def version
+      return final_releases.keys.sort.last if @version_ref == "latest"
+      unless final_releases[@version_ref.to_i]
+        err("Could not find version: #{@version_ref} for release: #{@name}")
       end
+      @version_ref.to_i
     end
 
+    private
+
     # transforms releases/foo-1.yml, releases/bar-2.yml to:
     # { "1" => foo-1.yml, "2" => bar-2.yml }
-    def available_versions
-      @available_versions ||= begin
-        Hash[Dir[File.join(repo_dir, "releases", "*.yml")].
-        reject { |f| f[/index.yml/] }.
-        map { |dir| File.basename(dir) }.
-        map { |version| [ version[/(\d+)/].to_i, version ] }]
+    def final_releases
+      @final_releases ||= begin
+        Hash[Dir[File.join(repo_dir, "releases", "*.yml")]
+          .reject { |f| f[/index.yml/] }
+          .map { |dir| File.join("releases", File.basename(dir)) }
+          .map { |version| [version[/(\d+)/].to_i, version] }]
       end
     end
 
-    def repo_dir
-      File.join(@work_dir, @name)
+    def ref
+      @repo.log.object(manifest).first
+    end
+
+    def init_repo
+      if File.directory?(repo_dir)
+        @repo ||= Git.open(repo_dir)
+      else
+        releases_dir = File.dirname(repo_dir)
+        FileUtils.mkdir_p(releases_dir)
+        @repo = Git.clone(@git_uri, @name, path: releases_dir)
+      end
     end
   end
 end

data/lib/bosh/workspace/stemcell.rb

@@ -0,0 +1,23 @@
+module Bosh::Workspace
+  class Stemcell
+    attr_reader :name, :version, :file
+
+    def initialize(stemcell, stemcells_dir)
+      @name = stemcell["name"]
+      @version = stemcell["version"]
+      @file = File.join(stemcells_dir, file_name)
+    end
+
+    def name_version
+      "#{name}/#{version}"
+    end
+
+    def file_name
+      name.gsub(/^bosh-/, "bosh-stemcell-#{version}-") + ".tgz"
+    end
+
+    def downloaded?
+      File.exists? file
+    end
+  end
+end

data/lib/bosh/workspace/stub_file.rb

@@ -0,0 +1,44 @@
+module Bosh::Workspace
+  class StubFile
+    attr_reader :name, :director_uuid
+
+    def self.create(path, project_deployment)
+      self.new(project_deployment).tap { |stub| stub.write(path) }
+    end
+
+    def initialize(project_deployment)
+      @name = project_deployment.name
+      @director_uuid = project_deployment.director_uuid
+      @releases = project_deployment.releases
+      @stemcells = project_deployment.stemcells
+      @meta = project_deployment.meta
+    end
+
+    def write(file)
+      IO.write file, content.to_yaml
+    end
+
+    def content
+      {
+        "name" => name,
+        "director_uuid" => director_uuid,
+        "releases" => releases,
+        "meta" => meta
+      }
+    end
+
+    def releases
+      @releases.map { |r| r.select { |key| %w[name version].include?(key) } }
+    end
+
+    def meta
+      out = case @stemcells.size
+      when 1
+        { "stemcell" => @stemcells.first }
+      else
+        { "stemcells" => @stemcells }
+      end
+      out.merge(@meta)
+    end
+  end
+end

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/spec/assets/dns/job-properties.yml

@@ -0,0 +1,22 @@
+name: foo
+
+networks:
+  - name: default
+    type: manual
+
+jobs:
+- name: first_job_az1
+  networks:
+  - name: default
+    static_ips:
+    - 10.0.0.50
+
+- name: second_job_az1
+  networks:
+  - name: default
+    static_ips:
+    - 10.0.0.51
+  properties:
+    job1:
+      foo: bar
+      address: 10.0.0.50

data/spec/assets/dns/jobs.yml

@@ -0,0 +1,18 @@
+networks:
+  - name: default
+    type: manual
+
+jobs:
+- name: job1
+  networks:
+  - name: default
+    static_ips:
+    - 10.0.0.50
+- name: job2
+  networks:
+  - name: default
+    static_ips:
+    - 10.0.0.51
+- name: job3
+  networks:
+  - name: default