vagrant-aws-mkubenka 0.7.2.pre.10 → 0.7.2.pre.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 501f18e17e8ec70da2fbb1519c194488e2bd9869
-  data.tar.gz: a284c2af7a88fc1de2d6513294759202050d54f4
+SHA256:
+  metadata.gz: 10578ed4a58f5e0da85f295a05adac33f87e5cb48eae65dd9836d7c7968f9153
+  data.tar.gz: d5979ab30db599c9ede5c05b8dbeb73736ed1356f3b3e3d733f7d0b83915e8b4
 SHA512:
-  metadata.gz: b0c929872a6ea16d0ab38c00c43189fc51789317e9026a623aabf417fd8d8fd3d764a7f1f6b33a8fc78ccf74a0bcbed1421f78a70f4e2c2540d23a156eba1d10
-  data.tar.gz: 3b4e7f51abecdb1a066f559cade4bb5c9a1888439f665f0dc6127448080c15ce16ca9ff9c8f989c6a4773a1e754cd9437d415982e1bc18edab0216e29ef993a3
+  metadata.gz: 5110fe49364b604e3b777d172213f83e0d8330a7ffae9182c6bca145b86e2a03e847c1dbf49216cf4a176f1ec09b84447aa348d07da972b76bee3ba7edd43032
+  data.tar.gz: 183b52a5708b92dd84613816f8e844c1a15c698c6ca8267fa24df800a19cb51f3cf4aee40a9d85f6d0c1b9f26556933dab43e1917f3b0d7b186638081955ae3e

data/.travis.yml

@@ -5,8 +5,9 @@ sudo: false
 cache: bundler
 
 rvm:
-  - 2.2.7
-  - 2.3.4
+  - 2.5
+  - 2.6
+  - 2.7
 
 deploy:
   provider: rubygems
@@ -16,4 +17,4 @@ deploy:
   on:
     repo: mkubenka/vagrant-aws
     branch: mkubenka
-    rvm: 2.3.4
+    rvm: 2.7

data/README.md

@@ -1,13 +1,7 @@
 # Vagrant AWS Provider
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/mitchellh/vagrant-aws?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-<span class="badges">
-[![Gem Version](https://badge.fury.io/rb/vagrant-aws.png)][gem]
-[![Dependency Status](https://gemnasium.com/mitchellh/vagrant-aws.png)][gemnasium]
-</span>
-
-[gem]: https://rubygems.org/gems/vagrant-aws
-[gemnasium]: https://gemnasium.com/mitchellh/vagrant-aws
+[![Build Status](https://travis-ci.org/mkubenka/vagrant-aws.svg?branch=mkubenka)](https://travis-ci.org/mkubenka/vagrant-aws)
+[![Gem Version](https://badge.fury.io/rb/vagrant-aws-mkubenka.svg)](https://badge.fury.io/rb/vagrant-aws-mkubenka)
 
 This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [AWS](http://aws.amazon.com)
 provider to Vagrant, allowing Vagrant to control and provision machines in
@@ -24,6 +18,7 @@ EC2 and VPC.
 * Define region-specific configurations so Vagrant can manage machines
   in multiple regions.
 * Package running instances into new vagrant-aws friendly boxes
+* Spot Instance Support
 
 ## Usage
 
@@ -32,7 +27,7 @@ installing, `vagrant up` and specify the `aws` provider. An example is
 shown below.
 
 ```
-$ vagrant plugin install vagrant-aws
+$ vagrant plugin install vagrant-aws-mkubenka
 ...
 $ vagrant up --provider=aws
 ...
@@ -170,6 +165,11 @@ This provider exposes quite a few provider-specific configuration options:
   when you initiate shutdown from the instance.
 * `endpoint` - The endpoint URL for connecting to AWS (or an AWS-like service). Only required for non AWS clouds, such as [eucalyptus](https://github.com/eucalyptus/eucalyptus/wiki).
 
+* `spot_instance` - Boolean value; indicates whether the config is for a spot instance, or on-demand. For more information about spot instances, see the [AWS Documentation](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/how-spot-instances-work.html)
+* `spot_max_price` - Decimal value; state the maximum bid for your spot instance. If nil, it will compute average price in `region` for selected `instance_type`.
+* `spot_price_product_description` - The product description for the spot price history used to compute average price. Defaults to 'Linux/UNIX'. 
+* `spot_valid_until` - Timestamp; when this spot instance request should expire, destroying any related instances. Ignored if `spot_instance` is not true.
+
 These can be set like typical provider-specific configuration:
 
 ```ruby

data/lib/vagrant-aws/action/connect_aws.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
 
         def call(env)
           # Get the region we're going to booting up in
-          region = env[:machine].provider_config.region
+          region = env[:machine].provider.region
 
           # Get the configs
           region_config = env[:machine].provider_config.get_region_config(region)
@@ -38,7 +38,7 @@ module VagrantPlugins
 
           @logger.info("Connecting to AWS...")
           env[:aws_compute] = Fog::Compute.new(fog_config)
-          env[:aws_elb]     = Fog::AWS::ELB.new(fog_config.except(:provider, :endpoint))
+          env[:aws_elb]     = Fog::AWS::ELB.new(fog_config.slice(*fog_config.keys - [:provider, :endpoint]))
 
           @app.call(env)
         end

data/lib/vagrant-aws/action/package_instance.rb

@@ -52,7 +52,7 @@ module VagrantPlugins
             env[:metrics]["instance_ready_time"] = Util::Timer.time do
               
               # Get the config, to set the ami burn timeout
-              region = env[:machine].provider_config.region
+              region = env[:machine].provider.region
               region_config = env[:machine].provider_config.get_region_config(region)
               tries = region_config.instance_package_timeout / 2
 
@@ -128,7 +128,7 @@ module VagrantPlugins
         def create_vagrantfile env
           File.open(File.join(env["export.temp_dir"], "Vagrantfile"), "w") do |f|
             f.write(TemplateRenderer.render("vagrant-aws_package_Vagrantfile", {
-              region: env[:machine].provider_config.region,
+              region: env[:machine].provider.region,
               ami: @ami_id,
               template_root: template_root
             }))

data/lib/vagrant-aws/action/read_ssh_info.rb

@@ -31,7 +31,7 @@ module VagrantPlugins
 
           # read attribute override
           ssh_host_attribute = machine.provider_config.
-              get_region_config(machine.provider_config.region).ssh_host_attribute
+              get_region_config(machine.provider.region).ssh_host_attribute
           # default host attributes to try. NOTE: Order matters!
           ssh_attrs = [:dns_name, :public_ip_address, :private_ip_address]
           ssh_attrs = (Array(ssh_host_attribute) + ssh_attrs).uniq if ssh_host_attribute

data/lib/vagrant-aws/action/run_instance.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
           env[:metrics] ||= {}
 
           # Get the region we're going to booting up in
-          region = env[:machine].provider_config.region
+          region = env[:machine].provider.region
 
           # Get the configs
           region_config         = env[:machine].provider_config.get_region_config(region)
@@ -107,7 +107,11 @@ module VagrantPlugins
           end
 
           begin
-            server = env[:aws_compute].servers.create(options)
+            server = if region_config.spot_instance
+                       server_from_spot_request(env, region_config, options)
+                     else
+                       env[:aws_compute].servers.create(options)
+                     end
           rescue Fog::Compute::AWS::NotFound => e
             # Invalid subnet doesn't have its own error so we catch and
             # check the error message here.
@@ -128,6 +132,11 @@ module VagrantPlugins
           # Immediately save the ID since it is created at this point.
           env[:machine].id = server.id
 
+          # Immediately save the region in which the instance was launched.
+          env[:machine].data_dir.join("region").open("w+") do |f|
+            f.write(region)
+          end
+
           # Wait for the instance to be ready first
           env[:metrics]["instance_ready_time"] = Util::Timer.time do
             tries = region_config.instance_ready_timeout / 2
@@ -212,6 +221,87 @@ module VagrantPlugins
           @app.call(env)
         end
 
+        # returns a fog server or nil
+        def server_from_spot_request(env, config, options)
+          if config.spot_max_price.nil?
+            spot_price_current = env[:aws_compute].describe_spot_price_history({
+              'StartTime' => Time.now.iso8601,
+              'EndTime' => Time.now.iso8601,
+              'InstanceType' => [config.instance_type],
+              'ProductDescription' => [config.spot_price_product_description.nil? ? 'Linux/UNIX' : config.spot_price_product_description]
+            })
+
+            spot_price_current.body['spotPriceHistorySet'].each do |set|
+              (@price_set ||= []) << set['spotPrice'].to_f
+            end
+
+            if @price_set.nil?
+              raise Errors::FogError,
+                :message => "Could not find any history spot prices."
+            end
+
+            avg_price = @price_set.inject(0.0) { |sum, el| sum + el } / @price_set.size
+
+            # make the bid 10% higher than the average
+            price = (avg_price * 1.1).round(4)
+          else
+            price = config.spot_max_price
+          end
+
+          options.merge!({
+            :price => price,
+            :valid_until => config.spot_valid_until
+          })
+
+          env[:ui].info(I18n.t("vagrant_aws.launching_spot_instance"))
+          env[:ui].info(" -- Price: #{price}")
+          env[:ui].info(" -- Valid until: #{config.spot_valid_until}") if config.spot_valid_until
+
+          # create the spot instance
+          spot_req = env[:aws_compute].spot_requests.create(options)
+
+          @logger.info("Spot request ID: #{spot_req.id}")
+
+          # initialize state
+          status_code = ""
+          while true
+            sleep 5
+
+            spot_req.reload()
+
+            # display something whenever the status code changes
+            if status_code != spot_req.state
+              env[:ui].info(spot_req.fault)
+              status_code = spot_req.state
+            end
+            spot_state = spot_req.state.to_sym
+            case spot_state
+            when :not_created, :open
+              @logger.debug("Spot request #{spot_state} #{status_code}, waiting")
+            when :active
+              break; # :)
+            when :closed, :cancelled, :failed
+              msg = "Spot request #{spot_state} #{status_code}, aborting"
+              @logger.error(msg)
+              raise Errors::FogError, :message => msg
+            else
+              @logger.debug("Unknown spot state #{spot_state} #{status_code}, waiting")
+            end
+          end
+          # cancel the spot request but let the server go thru
+          spot_req.destroy()
+
+          server = env[:aws_compute].servers.get(spot_req.instance_id)
+
+          # Spot Instances don't support tagging arguments on creation
+          # Retrospectively tag the server to handle this
+          if !config.tags.empty?
+            env[:aws_compute].create_tags(server.identity, config.tags)
+          end
+
+          server
+        end
+
         def recover(env)
           return if env["vagrant.error"].is_a?(Vagrant::Errors::VagrantError)
 

data/lib/vagrant-aws/action/terminate_instance.rb

@@ -13,7 +13,7 @@ module VagrantPlugins
 
         def call(env)
           server         = env[:aws_compute].servers.get(env[:machine].id)
-          region         = env[:machine].provider_config.region
+          region         = env[:machine].provider.region
           region_config  = env[:machine].provider_config.get_region_config(region)
 
           elastic_ip     = region_config.elastic_ip

data/lib/vagrant-aws/config.rb

@@ -196,6 +196,26 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :aws_profile
 
+      # Launch as spot instance
+      #
+      # @return [Boolean]
+      attr_accessor :spot_instance
+
+      # Spot request max price
+      #
+      # @return [String]
+      attr_accessor :spot_max_price
+
+      # Spot request validity
+      #
+      # @return [Time]
+      attr_accessor :spot_valid_until
+
+      # The product description for the spot price history
+      #
+      # @return [String]
+      attr_accessor :spot_price_product_description
+
       def initialize(region_specific=false)
         @access_key_id             = UNSET_VALUE
         @ami                       = UNSET_VALUE
@@ -233,6 +253,9 @@ module VagrantPlugins
         @tenancy                   = UNSET_VALUE
         @aws_dir                   = UNSET_VALUE
         @aws_profile               = UNSET_VALUE
+        @spot_instance             = UNSET_VALUE
+        @spot_max_price            = UNSET_VALUE
+        @spot_valid_until          = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -409,6 +432,18 @@ module VagrantPlugins
         # default to nil
         @kernel_id = nil if @kernel_id == UNSET_VALUE
 
+        # By default don't use spot requests
+        @spot_instance = false if @spot_instance == UNSET_VALUE
+
+        # default to nil
+        @spot_max_price = nil if @spot_max_price == UNSET_VALUE
+
+        # Default: Request is effective indefinitely.
+        @spot_valid_until = nil if @spot_valid_until == UNSET_VALUE
+
+        # default to nil
+        @spot_price_product_description = nil if @spot_price_product_description == UNSET_VALUE
+
         # Compile our region specific configurations only within
         # NON-REGION-SPECIFIC configurations.
         if !@__region_specific
@@ -479,14 +514,14 @@ module VagrantPlugins
 
 
     class Credentials < Vagrant.plugin("2", :config)
-      # This module reads AWS config and credentials. 
+      # This module reads AWS config and credentials.
       # Behaviour aims to mimic what is described in AWS documentation:
       # http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html
       # http://docs.aws.amazon.com/cli/latest/topic/config-vars.html
       # Which is the following (stopping at the first successful case):
       # 1) read config and credentials from environment variables
       # 2) read config and credentials from files at location defined by environment variables
-      # 3) read config and credentials from files at default location 
+      # 3) read config and credentials from files at default location
       #
       # The mandatory fields for a successful "get credentials" are the id and the secret keys.
       # Region is not required since Config#finalize falls back to sensible defaults.

data/lib/vagrant-aws/provider.rb

@@ -41,6 +41,18 @@ module VagrantPlugins
         Vagrant::MachineState.new(state_id, short, long)
       end
 
+      def region
+        # Return the region associated with the instance if the machine
+        # has already been launched, or return the default region configured.
+        machine_region_file = @machine.data_dir.join("region")
+
+        if File.exists?(machine_region_file)
+          return File.read(machine_region_file)
+        else
+          return @machine.provider_config.region
+        end
+      end
+
       def to_s
         id = @machine.id.nil? ? "new" : @machine.id
         "AWS (#{id})"

data/lib/vagrant-aws/util/elb.rb

@@ -34,7 +34,7 @@ module VagrantPlugins
         instances = env[:aws_compute].servers.all("instance-id" => elb.instances)
         
         azs = if instances.empty?
-                ["#{env[:machine].provider_config.region}a"]
+                ["#{env[:machine].provider.region}a"]
               else
                 instances.map(&:availability_zone).uniq
               end

data/locales/en.yml

@@ -18,6 +18,8 @@ en:
 
     launching_instance: |-
       Launching an instance with the following settings...
+    launching_spot_instance: |-
+       Launching a spot request instance with the following settings...
     launch_no_keypair: |-
       Warning! You didn't specify a keypair to launch your instance with.
       This can sometimes result in not being able to access your instance.
@@ -104,7 +106,7 @@ en:
         Error: %{err}
       instance_package_timeout: |-
         The AMI failed to become "ready" in AWS. The timeout currently
-        set waiting for the instance to become ready is %{timeout} seconds. For 
+        set waiting for the instance to become ready is %{timeout} seconds. For
         larger instances AMI burning may take long periods of time. Please
         ensure the timeout is set high enough, it can be changed by adjusting
         the `instance_package_timeout` configuration on the AWS provider.

data/spec/vagrant-aws/config_spec.rb

@@ -58,6 +58,10 @@ describe VagrantPlugins::AWS::Config do
     its("associate_public_ip")     { should == false }
     its("unregister_elb_from_az") { should == true }
     its("tenancy")     { should == "default" }
+    its("spot_instance")     { should == false }
+    its("spot_max_price")    { should be_nil }
+    its("spot_price_product_description")  { should be_nil }
+    its("spot_valid_until")  { should be_nil }
   end
 
   describe "overriding defaults" do

data/vendor/bundle/ruby/2.7.0/bundler/gems/vagrant-22795b161bf6/.gitignore

@@ -0,0 +1,52 @@
+# OS-specific
+.DS_Store
+
+# Editor swapfiles
+.*.sw?
+*~
+
+# Vagrant stuff
+acceptance_config.yml
+boxes/*
+/.vagrant
+/website/.vagrant
+/website/build
+/vagrant-spec.config.rb
+test/vagrant-spec/.vagrant/
+
+# Bundler/Rubygems
+*.gem
+.bundle
+pkg/*
+tags
+/Gemfile.lock
+test/tmp/
+vendor/
+/exec
+.ruby-bundle
+
+# Documentation
+_site/*
+.yardoc/
+doc/
+
+# Python
+*.pyc
+
+# Rubinius
+*.rbc
+
+# IDE junk
+.idea/*
+*.iml
+.project
+
+# Ruby Managers
+.rbenv
+.rbenv-gemsets
+.ruby-gemset
+.ruby-version
+.rvmrc
+
+# Box storage for spec
+test/vagrant-spec/boxes/*.box

data/vendor/bundle/ruby/2.7.0/bundler/gems/vagrant-22795b161bf6/.hashibot.hcl

@@ -0,0 +1,14 @@
+poll "closed_issue_locker" "locker" {
+  schedule             = "0 50 1 * * *"
+  closed_for           = "720h" # 30 days
+  max_issues           = 500
+  sleep_between_issues = "5s"
+
+  no_comment_if_no_activity_for = "4320h" # 180 days
+
+  message = <<-EOF
+    I'm going to lock this issue because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.
+
+    If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
+  EOF
+}