Clean up ruby packer build code

This commit makes the ruby invoking packer more flexible in what is
passed to the packer binary so that a broader set of IaaS accounts can
be used.

Author: aramprice

lib/packer/config/aws.rb

@@ -64,7 +64,7 @@ def assume_role_parameters
       end
 
       def instance_type
-        'm4.large'
+        'm5.large'
       end
 
       def launch_block_device_mappings

lib/packer/config/gcp.rb

@@ -3,7 +3,22 @@
 module Packer
   module Config
     class Gcp
-      def initialize(account_json:, project_id:, source_image:, image_family:, os:, output_directory:, version:, vm_prefix: '', mount_ephemeral_disk: false)
+      def initialize(
+        account_json:,
+        project_id:,
+        source_image:,
+        image_family:,
+        os:,
+        output_directory:,
+        version:,
+        vm_prefix: '',
+        mount_ephemeral_disk: false,
+        root_disk_size: 32,
+        omit_external_ip: false,
+        vm_tags: ['winrm'],
+        network: nil,
+        network_project_id: nil,
+        subnetwork: nil)
         @account_json = account_json
         @project_id = project_id
         @source_image = source_image
@@ -13,32 +28,42 @@ def initialize(account_json:, project_id:, source_image:, image_family:, os:, ou
         @version = version
         @vm_prefix = vm_prefix.empty? ? 'packer' : vm_prefix
         @mount_ephemeral_disk = mount_ephemeral_disk
+        @root_disk_size = root_disk_size
+        @omit_external_ip = omit_external_ip
+        @vm_tags = vm_tags
+        @network = network
+        @network_project_id = network_project_id
+        @subnetwork = subnetwork
       end
 
       def builders
         [
-            {
-                'type' => 'googlecompute',
-                'credentials_json' => @account_json,
-                'project_id' => @project_id,
-                'tags' => ['winrm'],
-                'source_image' => @source_image,
-                'image_family' => @image_family,
-                'zone' => 'us-east1-c',
-                'disk_size' => 32,
-                'image_name' => "packer-#{Time.now.to_i}",
-                'machine_type' => 'n1-standard-4',
-                'omit_external_ip' => false,
-                'communicator' => 'winrm',
-                'winrm_username' => 'winrmuser',
-                'winrm_use_ssl' => false,
-                'winrm_timeout' => '1h',
-                'state_timeout' => '10m',
-                'metadata' => {
-                    'sysprep-specialize-script-url' => 'https://raw.githubusercontent.com/cloudfoundry/bosh-windows-stemcell-builder/master/scripts/gcp/setup-winrm.ps1',
-                    'name' => "#{@vm_prefix}-#{Time.now.to_i}",
-                }
-            }
+          {
+            'type' => 'googlecompute',
+            'credentials_json' => @account_json,
+            'project_id' => @project_id,
+            'tags' => @vm_tags,
+            'source_image' => @source_image,
+            'image_family' => @image_family,
+            'zone' => 'us-west1-c',
+            'disk_size' => @root_disk_size,
+            'image_name' => "packer-#{Time.now.to_i}",
+            'machine_type' => 'n1-standard-4',
+            'network' => @network,
+            'network_project_id' => @network_project_id,
+            'subnetwork' => @subnetwork,
+            'omit_external_ip' => @omit_external_ip,
+            'use_internal_ip' => @omit_external_ip,
+            'communicator' => 'winrm',
+            'winrm_username' => 'winrmuser',
+            'winrm_use_ssl' => false,
+            'winrm_timeout' => '1h',
+            'state_timeout' => '10m',
+            'metadata' => {
+              'sysprep-specialize-script-url' => 'https://raw.githubusercontent.com/cloudfoundry/bosh-windows-stemcell-builder/master/scripts/gcp/setup-winrm.ps1',
+              'name' => "#{@vm_prefix}-#{Time.now.to_i}",
+            }.compact_blank!
+          }
         ]
       end
 
@@ -48,8 +73,8 @@ def provisioners
 
       def dump
         JSON.dump(
-            'builders' => builders,
-            'provisioners' => provisioners
+          'builders' => builders,
+          'provisioners' => provisioners
         )
       end
     end

lib/packer/config/provisioners.rb

@@ -17,7 +17,7 @@ def initialize(os, iaas, enable_ephemeral_disk, version, http_proxy = nil, https
     @ephemeral_disk_flag = enable_ephemeral_disk ? ' -EnableEphemeralDiskMounting' : ''
     @version = version
     @proxy_settings = http_proxy || https_proxy ? "\\\"#{http_proxy}\\\" \\\"#{https_proxy}\\\" \\\"#{bypass_list}\\\"" : ''
-    @installWindowsUpdates = (build_context != :patchfile)
+    @install_windows_updates = (build_context != :patchfile)
 
     filename = File.expand_path("../templates/provision_#{os}.json.erb", __FILE__)
     @erb = ERB.new(File.read(filename))
@@ -31,7 +31,7 @@ def dump
                                        password: SecureRandom.hex(10) + "!",
                                        ephemeral_disk_flag: @ephemeral_disk_flag,
                                        proxy_settings: @proxy_settings,
-                                       install_windows_updates: @installWindowsUpdates,
+                                       install_windows_updates: @install_windows_updates,
                                        stemcell_version: @version,
                                    })
     JSON.parse(result)

lib/stemcell/builder/gcp.rb

@@ -3,12 +3,22 @@ class Builder
     class Gcp < Base
       attr_accessor :image_url
 
-      def initialize(account_json:, source_image:, image_family:, vm_prefix:, **kwargs)
+      def initialize(account_json:,
+                     source_image:,
+                     image_family:,
+                     vm_prefix:,
+                     network:,
+                     network_project_id:,
+                     subnetwork:,
+                     **kwargs)
         @account_json = account_json
         @project_id = JSON.parse(@account_json)['project_id']
         @source_image = source_image
         @image_family = image_family
         @vm_prefix = vm_prefix
+        @network = network
+        @network_project_id = network_project_id
+        @subnetwork = subnetwork
         super(**kwargs)
       end
 
@@ -25,38 +35,42 @@ def build
       end
 
       private
-        def packer_config
-          Packer::Config::Gcp.new(
-            account_json: @account_json,
-            project_id: @project_id,
-            source_image: @source_image,
-            output_directory: @output_directory,
-            image_family: @image_family,
-            os: @os,
-            version: @version,
-            vm_prefix: @vm_prefix,
-            mount_ephemeral_disk: @mount_ephemeral_disk
-          ).dump
-        end
 
-        def parse_packer_output(packer_output)
-          image_name = nil
-          packer_output.each_line do |line|
-            Output.say line
-            image_name ||= parse_image_name(line)
-          end
-          get_image_url(image_name)
-        end
+      def packer_config
+        Packer::Config::Gcp.new(
+          account_json: @account_json,
+          project_id: @project_id,
+          source_image: @source_image,
+          output_directory: @output_directory,
+          image_family: @image_family,
+          network: @network,
+          network_project_id: @network_project_id,
+          subnetwork: @subnetwork,
+          os: @os,
+          version: @version,
+          vm_prefix: @vm_prefix,
+          mount_ephemeral_disk: @mount_ephemeral_disk
+        ).dump
+      end
 
-        def parse_image_name(line)
-          if line.include?(",artifact,0,id,")
-            return line.split(",").last.chomp
-          end
+      def parse_packer_output(packer_output)
+        image_name = nil
+        packer_output.each_line do |line|
+          Output.say line
+          image_name ||= parse_image_name(line)
         end
+        get_image_url(image_name)
+      end
 
-        def get_image_url(image_name)
-          "https://www.googleapis.com/compute/v1/projects/#{@project_id}/global/images/#{image_name}"
+      def parse_image_name(line)
+        if line.include?(",artifact,0,id,")
+          line.split(",").last.chomp
         end
+      end
+
+      def get_image_url(image_name)
+        "https://www.googleapis.com/compute/v1/projects/#{@project_id}/global/images/#{image_name}"
+      end
     end
   end
 end

lib/tasks/build/gcp.rake

@@ -27,6 +27,9 @@ namespace :build do
     gcp_builder = Stemcell::Builder::Gcp.new(
       account_json: Stemcell::Builder::validate_env('ACCOUNT_JSON'),
       os: Stemcell::Builder::validate_env('OS_VERSION'),
+      network: ENV.fetch('GCP_NETWORK', ''), # optional
+      network_project_id: ENV.fetch('GCP_NETWORK_PROJECT_ID', ''), # optional
+      subnetwork: ENV.fetch('GCP_SUBNETWORK', ''), # optional
       output_directory: output_directory,
       packer_vars: {},
       source_image: source_image,

spec/packer/config/aws_spec.rb

@@ -43,7 +43,7 @@
         secret_key: 'some-aws-secret-key',
         region: 'region1',
         source_ami: 'baseami1',
-        instance_type: 'm4.large',
+        instance_type: 'm5.large',
         vpc_id: 'vpc1',
         subnet_id: 'subnet1',
         associate_public_ip_address: true,

spec/packer/config/gcp_spec.rb

@@ -28,7 +28,7 @@
             'tags' => ['winrm'],
             'source_image' => 'some-source-image',
             'image_family' => 'some-image-family',
-            'zone' => 'us-east1-c',
+            'zone' => 'us-west1-c',
             'disk_size' => 32,
             'machine_type' => 'n1-standard-4',
             'omit_external_ip' => false,

spec/stemcell/builder/gcp_spec.rb

@@ -27,6 +27,9 @@
         source_image = "some-source-image"
         image_family= "some-family"
         vm_prefix = "some-vm-prefix"
+        network = 'default'
+        network_project_id = 'project-id'
+        subnetwork = 'subnet'
 
         packer_config = double(:packer_config)
         allow(packer_config).to receive(:dump).and_return(config)
@@ -39,7 +42,10 @@
           os: os,
           version: version,
           vm_prefix: vm_prefix,
-          mount_ephemeral_disk: false
+          mount_ephemeral_disk: false,
+          network: network,
+          network_project_id: network_project_id,
+          subnetwork: subnetwork,
         ).and_return(packer_config)
 
         packer_runner = double(:packer_runner)
@@ -71,7 +77,10 @@
           source_image: source_image,
           image_family: image_family,
           vm_prefix: vm_prefix,
-          mount_ephemeral_disk: "false"
+          mount_ephemeral_disk: "false",
+          network: network,
+          network_project_id: network_project_id,
+          subnetwork: subnetwork,
         ).build
         expect(stemcell_path).to eq('path-to-stemcell')
       end
@@ -85,6 +94,9 @@
           packer_vars = 'some-packer-vars'
           os = 'windows2019'
           vm_prefix = 'some-vm-prefix'
+          network = 'default'
+          network_project_id = 'project-id'
+          subnetwork = 'subnet'
 
           packer_config = double(:packer_config)
           allow(packer_config).to receive(:dump).and_return('some-packer-config')
@@ -97,7 +109,10 @@
             os: os,
             version: '',
             vm_prefix: vm_prefix,
-            mount_ephemeral_disk: false
+            mount_ephemeral_disk: false,
+            network: network,
+            network_project_id: network_project_id,
+            subnetwork: subnetwork,
           ).and_return(packer_config)
 
           packer_runner = double(:packer_runner)
@@ -110,6 +125,9 @@
               output_directory: output_directory,
               version: '',
               packer_vars: packer_vars,
+              network: network,
+              network_project_id: network_project_id,
+              subnetwork: subnetwork,
               account_json: account_json,
               source_image: source_image,
               image_family: image_family,