From 03f76fb71b9484c08402e5278610ad342525264b Mon Sep 17 00:00:00 2001
From: Gab Satchi <gsatchithanantham@pivotal.io>
Date: Wed, 18 Jul 2018 12:08:37 -0400
Subject: [PATCH] - Sets encrypted cloud_property in stemcell manifest to false

[#159046887] (https://www.pivotaltracker.com/story/show/159046887)

Signed-off-by: Kenny DuMez <kdumez@pivotal.io>
---
 lib/stemcell/manifest.rb                      |   1 +
 ...n-hvm-windows2012R2-go_agent-us-east-1.tgz | Bin 1797 -> 1957 bytes
 spec/integration/build/aws_spec.rb            |   2 ++
 spec/stemcell/manifest_spec.rb                |   1 +
 4 files changed, 4 insertions(+)

diff --git a/lib/stemcell/manifest.rb b/lib/stemcell/manifest.rb
index 475116eb..8ba4ea75 100644
--- a/lib/stemcell/manifest.rb
+++ b/lib/stemcell/manifest.rb
@@ -34,6 +34,7 @@ def initialize(version, os, amis)
         super("bosh-aws-xen-hvm-#{os}-stemcell-go_agent", version, EMPTY_FILE_SHA, os)
         cloud_properties = {
           'infrastructure' => 'aws',
+          'encrypted' => false,
           'ami' => {}
         }
         amis.each do |ami|
diff --git a/spec/fixtures/aws/amis/light-bosh-stemcell-1200.3.1-build.2-aws-xen-hvm-windows2012R2-go_agent-us-east-1.tgz b/spec/fixtures/aws/amis/light-bosh-stemcell-1200.3.1-build.2-aws-xen-hvm-windows2012R2-go_agent-us-east-1.tgz
index ae3b455e53ab5d85fdf8cbf728cae378c87fe9a4..557088162cce8ef8ff60fa2b4b02057b484b06b1 100644
GIT binary patch
literal 1957
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

literal 1797
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

diff --git a/spec/integration/build/aws_spec.rb b/spec/integration/build/aws_spec.rb
index 5a27738c..4b495910 100644
--- a/spec/integration/build/aws_spec.rb
+++ b/spec/integration/build/aws_spec.rb
@@ -97,6 +97,7 @@
       expect(stemcell_manifest['operating_system']).to eq(@os_version)
       expect(stemcell_manifest['stemcell_formats']).to eq(['aws-light'])
       expect(stemcell_manifest['cloud_properties']['infrastructure']).to eq('aws')
+      expect(stemcell_manifest['cloud_properties']['encrypted']).to eq(false)
       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
 
@@ -192,6 +193,7 @@
       expect(stemcell_manifest['sha1']).to eq(EMPTY_FILE_SHA)
       expect(stemcell_manifest['operating_system']).to eq(@os_version)
       expect(stemcell_manifest['cloud_properties']['infrastructure']).to eq('aws')
+      expect(stemcell_manifest['cloud_properties']['encrypted']).to eq(false)
       expect(stemcell_manifest['cloud_properties']['ami']['us-east-1']).to be_nil
       expect(stemcell_manifest['cloud_properties']['ami']['us-east-2']).to eq('ami-east2id')
 
diff --git a/spec/stemcell/manifest_spec.rb b/spec/stemcell/manifest_spec.rb
index 7056662f..f4062f8d 100644
--- a/spec/stemcell/manifest_spec.rb
+++ b/spec/stemcell/manifest_spec.rb
@@ -37,6 +37,7 @@
           'operating_system' => 'some-os',
           'cloud_properties' => {
             'infrastructure' => 'aws',
+            'encrypted' => false,
             'ami' => {
               'region1' => 'ami1',
               'region2' => 'ami2'