stemcell 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0311d6f13f75e1e7e52496b9491eb5768c13eb35
-  data.tar.gz: 67d5f0c43c6fbc5a81139ff8773a82027bd4fd99
+  metadata.gz: 42199bc80153e575d437ce9c618b662e6861af3e
+  data.tar.gz: 53e93477347e08429b03e74b4580d4cc714c424d
 SHA512:
-  metadata.gz: 1d0e45ae07c7c9995d1c11198b0c6ba9991bc1e71e38fcdc6abf5e460ba91abcb52c45b27142c31b3a282738a86b8e53a3522be13f89e71c4b8f22229b2c8cbf
-  data.tar.gz: 27fc12f639c4b446edd1439e28d82d3dd078c807bbb2206f21b49fd73af1809d4543b86f6d3477ceaa797d4c93b0ce68d02d7038416a9b462e022bd8a3ffab10
+  metadata.gz: 67d1742a36a3f003a849651d9f7b899414a738ce2ea2a684efaf77bee1399fc65d824c174a28abdf981c2aa739e137d973589d29b2a15ef8e94dfcc94e9f1b3d
+  data.tar.gz: 0e916fa0c134eb26ff01cba67c6b1e90ae921fa932940f3596a5d09b0607a52abae2b99099d3569e3cf4b67ac4e2a91226666e32af9a250af0a33f081bbd4f71

data/.travis.yml

@@ -6,4 +6,4 @@ rvm:
   - 2.2.4
   - 2.3.1
 before_install:
-  - gem install bundler
+  - gem install bundler -v 1.16.3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.12.2
+- Support for using a custom EC2 endpoint
+
 # 0.12.1
 - Add support for Amazon Linux to the default bootstrap script
 - Allow setting backing_store options per region

data/examples/stemcell.json

@@ -9,10 +9,14 @@
 
   "backing_store": {
     "ebs": {
-      "image_id": "ami-23d9a94a"
+      "us-east-1": {
+        "image_id": "ami-23d9a94a"
+      }
     },
     "instance_store": {
-      "image_id": "ami-d9d6a6b0"
+      "us-east-1": {
+        "image_id": "ami-d9d6a6b0"
+      }
     }
   },
 

data/lib/stemcell/launcher.rb

@@ -75,6 +75,7 @@ module Stemcell
 
       @region = opts['region']
       @vpc_id = opts['vpc_id']
+      @ec2_endpoint = opts['ec2_endpoint']
       @aws_access_key = opts['aws_access_key']
       @aws_secret_key = opts['aws_secret_key']
       @aws_session_token = opts['aws_session_token']
@@ -315,7 +316,7 @@ module Stemcell
     def get_vpc_security_group_ids(vpc_id, group_names)
       group_map = {}
       @log.info "resolving security groups #{group_names} in #{vpc_id}"
-      vpc = AWS::EC2::VPC.new(vpc_id, :ec2_endpoint => "ec2.#{@region}.amazonaws.com")
+      vpc = AWS::EC2::VPC.new(vpc_id)
       vpc.security_groups.each do |sg|
         next if sg.vpc_id != vpc_id
         group_map[sg.name] = sg.group_id
@@ -433,13 +434,10 @@ module Stemcell
     def ec2
       return @ec2 if @ec2
 
-      # calculate our ec2 url
-      ec2_url = "ec2.#{@region}.amazonaws.com"
-
       if @vpc_id
-        @ec2 = AWS::EC2::VPC.new(@vpc_id, :ec2_endpoint => ec2_url)
+        @ec2 = AWS::EC2::VPC.new(@vpc_id)
       else
-        @ec2 = AWS::EC2.new(:ec2_endpoint => ec2_url)
+        @ec2 = AWS::EC2.new
       end
 
       @ec2
@@ -457,6 +455,9 @@ module Stemcell
     def configure_aws_creds_and_region
       # configure AWS with creds/region
       aws_configs = {:region => @region}
+      aws_configs.merge!({
+        :ec2_endpoint      => @ec2_endpoint
+      }) if @ec2_endpoint
       aws_configs.merge!({
         :access_key_id     => @aws_access_key,
         :secret_access_key => @aws_secret_key

data/lib/stemcell/metadata_launcher.rb

@@ -101,6 +101,7 @@ module Stemcell
         'region'            => options['region'],
         'vpc_id'            => options['vpc_id'],
         'max_attempts'      => options['batch_operation_retries'],
+        'ec2_endpoint'      => options['ec2_endpoint'],
       })
       # Slice off just the options used for launching.
       launch_options = {}

data/lib/stemcell/option_parser.rb

@@ -42,6 +42,12 @@ module Stemcell
         :env   => 'AWS_SESSION_TOKEN',
         :hide  => true
       },
+      {
+        :name  => 'ec2_endpoint',
+        :desc  => 'EC2 endpoint',
+        :type  => String,
+        :env   => 'EC2_ENDPOINT',
+      },
       {
         :name  => 'region',
         :desc  => "ec2 region to launch in",

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

data/spec/lib/stemcell/launcher_spec.rb

@@ -195,4 +195,18 @@ describe Stemcell::Launcher do
       expect(AWS.config.region).to be_eql('ap-northeast-1')
     end
   end
+
+  describe '#ec2' do
+    it 'can return a client with regional endpoint' do
+      launcher = Stemcell::Launcher.new({'region' => 'region1', 'ec2_endpoint' => nil})
+      client = launcher.send(:ec2)
+      expect(client.config.ec2_endpoint).to be_eql('ec2.region1.amazonaws.com')
+    end
+
+    it 'can return a client with custom endpoint' do
+      launcher = Stemcell::Launcher.new({'region' => 'region1', 'ec2_endpoint' => 'endpoint1'})
+      client = launcher.send(:ec2)
+      expect(client.config.ec2_endpoint).to be_eql('endpoint1')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Martin Rhoads
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1