Stop populating apply_spec.yml - AWS, Azure, GCP

A file called `apply_spec.yml` had historically been placed onto the
Windows stemcell on AWS, Azure, GCP, and possibly prior to `stembuild`
on vSphere as well.

Given that the vSphere Windows stemcells have shipped without this file
for many years it does not appear to be valuable.

For consistency this is being removed everywhere instead of propigated
to vSphere.

Author: aramprice

ci/tasks/build-agent-zip/run.sh

@@ -19,8 +19,6 @@ mkdir -p "${zip_deps_dir}"
 
 # agent-zip root
 cp "${bosh_agent_resource_dir}/bosh-agent-${bosh_agent_resource_version}-windows-amd64.exe" "${zip_dir}/bosh-agent.exe"
-# `sha` filename expected by `bosh-windows-stemcell-builder` rake tasks; TODO: reduce coupling
-cp "${bosh_agent_resource_dir}/git-sha-${bosh_agent_resource_version}" "${zip_dir}/sha"
 cp "${bosh_agent_resource_dir}/service_wrapper-${bosh_agent_resource_version}.xml" "${zip_dir}/service_wrapper.xml"
 
 cp "${CONCOURSE_ROOT}"/windows-winsw/WinSW.NET461.exe "${zip_dir}/service_wrapper.exe"

lib/stemcell/apply_spec.rb

@@ -6,4 +6,3 @@
 require_relative '../packer/runner'
 require_relative 'manifest'
 require_relative 'packager'
-require_relative 'apply_spec'

lib/stemcell/builder.rb

@@ -20,26 +20,23 @@ def self.validate_env_dir(vars)
     end
 
     class Base
-      def initialize(os:, output_directory:, version:, agent_commit:, packer_vars:, region: nil, mount_ephemeral_disk: 'false')
+      def initialize(os:, output_directory:, version:, packer_vars:, region: nil, mount_ephemeral_disk: 'false')
         @os = os
         @output_directory = output_directory
         @version = version
-        @agent_commit = agent_commit
         @packer_vars = packer_vars
         @region = region
         @mount_ephemeral_disk = mount_ephemeral_disk == 'true'
       end
 
       def build(iaas:, is_light:, image_path:, manifest:, update_list:)
-        apply_spec = ApplySpec.new(@agent_commit).dump
         Packager.package(
           iaas: iaas,
           os: @os,
           is_light: is_light,
           version: @version,
           image_path: image_path,
           manifest: manifest,
-          apply_spec: apply_spec,
           output_directory: @output_directory,
           update_list: update_list,
           region: @region

lib/stemcell/builder/base.rb

@@ -76,7 +76,7 @@ def self.read_from_tgz(path, filename)
       contents
     end
 
-    def self.package(iaas:, os:, is_light:, version:, image_path:, manifest:, apply_spec:, output_directory:, update_list:, region: nil)
+    def self.package(iaas:, os:, is_light:, version:, image_path:, manifest:, output_directory:, update_list:, region: nil)
       raise InvalidImagePathError unless File.file?(image_path) || is_light
       raise InvalidOutputDirError unless File.directory?(output_directory)
 
@@ -106,10 +106,6 @@ def self.package(iaas:, os:, is_light:, version:, image_path:, manifest:, apply_
               end
             end
 
-            tar.add_file_simple('apply_spec.yml', 0o666, apply_spec.length) do |io|
-              io.write(apply_spec)
-            end
-
             if update_list
               tar.add_file_simple('updates.txt', 0o666, File.size(update_list)) do |io|
                 updates = File.open(update_list,'rb')

lib/stemcell/packager.rb

@@ -184,10 +184,8 @@ def get_aws_builder(output_directory, region, base_ami = '')
   build_dir = File.join(base_dir, 'build')
   agent_dir = File.join(build_dir,'compiled-agent')
   version = File.read(File.join(version_dir, 'number')).chomp
-  agent_commit = File.read(File.join(agent_dir, 'sha')).chomp
 
   Stemcell::Builder::Aws.new(
-    agent_commit: agent_commit,
     ami: base_ami,
     aws_access_key: ENV['PACKER_AWS_ACCESS_KEY'] || ENV['AWS_ACCESS_KEY'],
     aws_secret_key: ENV['PACKER_AWS_SECRET_KEY'] || ENV['AWS_SECRET_KEY'],

lib/tasks/build/aws.rake

@@ -11,7 +11,6 @@ namespace :build do
     version_dir = Stemcell::Builder::validate_env_dir('VERSION_DIR')
 
     version = File.read(File.join(version_dir, 'number')).chomp
-    agent_commit = File.read(File.join(build_dir, 'compiled-agent', 'sha')).chomp
 
     output_directory = File.absolute_path('bosh-windows-stemcell')
     FileUtils.mkdir_p(output_directory)
@@ -29,7 +28,6 @@ namespace :build do
     azure_builder = Stemcell::Builder::Azure.new(
       packer_vars: {},
       version: version,
-      agent_commit: agent_commit,
       os: Stemcell::Builder::validate_env('OS_VERSION'),
       output_directory: output_directory,
       client_id: Stemcell::Builder::validate_env('CLIENT_ID'),

lib/tasks/build/azure.rake

@@ -13,7 +13,6 @@ namespace :build do
     base_image_dir = Stemcell::Builder::validate_env_dir('BASE_IMAGE_DIR')
 
     version = File.read(File.join(version_dir, 'number')).chomp
-    agent_commit = File.read(File.join(build_dir, 'compiled-agent', 'sha')).chomp
     gcp_image = JSON.parse(
       File.read(
         Dir.glob(File.join(base_image_dir, 'base-gcp-image-*.json'))[0]
@@ -27,7 +26,6 @@ namespace :build do
 
     gcp_builder = Stemcell::Builder::Gcp.new(
       account_json: Stemcell::Builder::validate_env('ACCOUNT_JSON'),
-      agent_commit: agent_commit,
       os: Stemcell::Builder::validate_env('OS_VERSION'),
       output_directory: output_directory,
       packer_vars: {},

lib/tasks/build/gcp.rake

@@ -18,7 +18,6 @@
 
     @os_version = 'windows2019'
     @version = '1200.3.1-build.2'
-    @agent_commit = 'some-agent-commit'
 
     ENV['AMIS_DIR'] = @amis_dir
     ENV['PACKER_AWS_ACCESS_KEY'] = @aws_access_key = 'some-aws_access_key'
@@ -37,10 +36,6 @@
     )
 
     FileUtils.mkdir_p(File.join(@build_dir, 'compiled-agent'))
-    File.write(
-      File.join(@build_dir, 'compiled-agent', 'sha'),
-      @agent_commit
-    )
 
     File.write(
       File.join(@base_amis_dir, 'base-amis-1.json'),
@@ -91,9 +86,6 @@
       expect(stemcell_manifest['cloud_properties']['ami']['us-east-1']).to eq('ami-east1id')
       expect(stemcell_manifest['cloud_properties']['ami']['us-east-2']).to be_nil
 
-      apply_spec = JSON.parse(read_from_tgz(stemcell, 'apply_spec.yml'))
-      expect(apply_spec['agent_commit']).to eq(@agent_commit)
-
       expect(read_from_tgz(stemcell, 'image')).to be_empty
       expect(File.read(stemcell_sha)).to eq(Digest::SHA1.hexdigest(File.read(stemcell)))
 
@@ -263,9 +255,6 @@
 
       expect(read_from_tgz(stemcell, 'updates.txt')).not_to be_nil
 
-      apply_spec = JSON.parse(read_from_tgz(stemcell, 'apply_spec.yml'))
-      expect(apply_spec['agent_commit']).to eq(@agent_commit)
-
       expect(read_from_tgz(stemcell, 'image')).to be_empty
       expect(File.read(stemcell_sha)).to eq(Digest::SHA1.hexdigest(File.read(stemcell)))
     end

spec/integration/build/aws_spec.rb

@@ -37,7 +37,6 @@
     Dir.mktmpdir('azure-stemcell-test') do |tmpdir|
       os_version = 'windows2019'
       version = '1200.0.1-build.7'
-      agent_commit = 'some-agent-commit'
 
       ENV['CLIENT_ID'] = 'some-azure_access_key'
       ENV['CLIENT_SECRET'] = 'some-azure_secret_key'
@@ -63,10 +62,6 @@
       )
 
       FileUtils.mkdir_p(File.join(@build_dir, 'compiled-agent'))
-      File.write(
-        File.join(@build_dir, 'compiled-agent', 'sha'),
-        agent_commit
-      )
 
       # This allows the task to be ran multiple times by different tests
       Rake::Task['build:azure'].reenable
@@ -95,11 +90,6 @@
       expect(stemcell_manifest['cloud_properties']['image']['sku']).to eq('some-sku')
       expect(stemcell_manifest['cloud_properties']['image']['version']).to eq('1200.0.001007')
 
-      apply_spec = JSON.parse(read_from_tgz(stemcell, 'apply_spec.yml'))
-      expect(apply_spec['agent_commit']).to eq(agent_commit)
-
-      # expect(read_from_tgz(stemcell, 'updates.txt')).to eq('some-updates')
-
       expect(read_from_tgz(stemcell, 'image')).to be_empty
       expect(File.read(stemcell_sha)).to eq(Digest::SHA1.hexdigest(File.read(stemcell)))
     end