Skip to content

Commit

Permalink
- Sets encrypted cloud_property in stemcell manifest to false
Browse files Browse the repository at this point in the history
[#159046887] (https://www.pivotaltracker.com/story/show/159046887)

Signed-off-by: Kenny DuMez <kdumez@pivotal.io>
  • Loading branch information
Gab Satchi authored and bot committed Jul 18, 2018
1 parent e35f40c commit 03f76fb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/stemcell/manifest.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
Binary file not shown.
2 changes: 2 additions & 0 deletions spec/integration/build/aws_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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')

Expand Down
1 change: 1 addition & 0 deletions spec/stemcell/manifest_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
'operating_system' => 'some-os',
'cloud_properties' => {
'infrastructure' => 'aws',
'encrypted' => false,
'ami' => {
'region1' => 'ami1',
'region2' => 'ami2'
Expand Down

0 comments on commit 03f76fb

Please sign in to comment.