vagrant-mos 0.9.20 → 0.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bae12df04b93f0f02bdae078f6d1f10760f4933
-  data.tar.gz: e92c667ebe41e4d81e39e4c85db93d51f71409a3
+  metadata.gz: 45f82edbe87bfdf7054790b4e9f809b8e3b263cb
+  data.tar.gz: 6bcb2b58893150c21f47222e0de992527d3f8b32
 SHA512:
-  metadata.gz: a24f9f4a9ee686d2879bb96db22c813cc169405cd83497dee46be0b54de6cf30a70e6bd27eee6de9f9251063f523ce4253d387671347e74a3e3820bbf21ca5c8
-  data.tar.gz: 97a607b2d35f4786f88e6fcfc1fc816414d90ba5059f60818083a1f89ec12c642981b98767271129410a97b820d5b56c2dd1f1692ae1ac3e7de304f5512f05ba
+  metadata.gz: 8d7b4b6c452f255a0800cf8c539ed383eda096e5f4d1e29066954bd813e7dc66edb611177450ab2d69d1cace595617b572c3db649c3d1346c574630823e3e639
+  data.tar.gz: c5ee63ab8f464dd3c20a00731db8e59dc094166b49ebf1af380bb8f2b5c94d0baa3d87acee14e68bab3357637e201fb45cd543eaca2a66d52544143f5f87c909

data/README.md

@@ -56,9 +56,9 @@ Vagrant.configure("2") do |config|
   config.vm.box = "mos_box"
 
   config.vm.provider :mos do |mos, override|
-    mos.access_key_id = "YOUR KEY"
-    mos.secret_access_key = "YOUR SECRET KEY"
-    mos.secret_access_url = "YOUR MOS ACCESS URL"
+    mos.access_key = "YOUR KEY"
+    mos.access_secret = "YOUR SECRET KEY"
+    mos.access_ur = "YOUR MOS ACCESS URL"
     mos.keypair_name = "KEYPAIR NAME"
 
     mos.template_id = "fa1026fe-c082-4ead-8458-802bf65ca64c"
@@ -82,9 +82,9 @@ end
 
 MOS provider设置了若干参数，主要参数说明如下：
 
-* `access_key_id` - 访问美团云的key
-* `secret_access_key` - 访问美团云的secret
-* `secret_access_url` -访问美团云的url
+* `access_key` - 访问美团云的key
+* `access_secret` - 访问美团云的secret
+* `access_ur` -访问美团云的url
 * `region` - 创建主机的region，例如 "us-east-1"
 * `template_id` - 创建美团云主机的镜像，例如 "fa1026fe-c082-4ead-8458-802bf65ca64c"，用户可以使用`vagrant mos-templates`查看可以使用的镜像
 * `instance_ready_timeout` - 等待MOS主机创建成功最长时间，单位为秒。默认为120s。
@@ -100,9 +100,9 @@ Vagrant.configure("2") do |config|
   # ... other stuff
 
   config.vm.provider :mos do |mos|
-    mos.access_key_id = "your_key"
-    mos.secret_access_key = "your_secret"
-    mos.secret_access_url = "your_access_url"
+    mos.access_key = "your_key"
+    mos.access_secret = "your_secret"
+    mos.access_ur = "your_access_url"
   end
 end
 ```

data/README_en.md

@@ -58,9 +58,9 @@ your information where necessary.
 Vagrant.configure("2") do |config|
   config.vm.box = "mos_box"
   config.vm.provider :mos do |mos, override|
-    mos.access_key_id = "YOUR KEY"
-    mos.secret_access_key = "YOUR SECRET KEY"
-    mos.secret_access_url = "YOUR MOS ACCESS URL"
+    mos.access_key = "YOUR KEY"
+    mos.access_secret = "YOUR SECRET KEY"
+    mos.access_ur = "YOUR MOS ACCESS URL"
     mos.keypair_name = "KEYPAIR NAME"
     mos.template_id = "fa1026fe-c082-4ead-8458-802bf65ca64c"
     override.ssh.username = "root"
@@ -97,7 +97,7 @@ provider-specific configuration for this provider.
 
 This provider exposes quite a few provider-specific configuration options:
 
-* `access_key_id` - The access key for accessing MOS
+* `access_key` - The access key for accessing MOS
 * `template_id` - The image id to boot, such as "fa1026fe-c082-4ead-8458-802bf65ca64c"
 * `instance_ready_timeout` - The number of seconds to wait for the instance
   to become "ready" in MOS. Defaults to 120 seconds.
@@ -107,9 +107,9 @@ This provider exposes quite a few provider-specific configuration options:
   value of this if not specified is "C1_M2".
 * `keypair_name` - The name of the keypair to use to bootstrap images.
    which support it.
-* `secret_access_url` - The accee url for accessing MOS
+* `access_ur` - The accee url for accessing MOS
 * `region` - The region to start the instance in, such as "us-east-1"
-* `secret_access_key` - The secret access key for accessing MOS
+* `access_secret` - The secret access key for accessing MOS
 * `use_iam_profile` - If true, will use [IAM profiles](http://docs.mos.amazon.com/IAM/latest/UserGuide/instance-profiles.html)
   for credentials.
 
@@ -120,9 +120,9 @@ Vagrant.configure("2") do |config|
   # ... other stuff
 
   config.vm.provider :mos do |mos|
-    mos.access_key_id = "your_key"
-    mos.secret_access_key = "your_secret"
-    mos.secret_access_url = "your_access_url"
+    mos.access_key = "your_key"
+    mos.access_secret = "your_secret"
+    mos.access_ur = "your_access_url"
   end
 end
 ```
@@ -137,8 +137,8 @@ Vagrant.configure("2") do |config|
   # ... other stuff
 
   config.vm.provider :mos do |mos|
-    mos.access_key_id = "foo"
-    mos.secret_access_key = "bar"
+    mos.access_key = "foo"
+    mos.access_secret = "bar"
     mos.region = "us-east-1"
 
     # Simple region config

data/lib/vagrant-mos/action/connect_mos.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
           region_config = env[:machine].provider_config.get_region_config(region)
 
           @logger.info("Connecting to MOS...")
-          env[:mos_compute] = Client.new(region_config.access_key_id, region_config.secret_access_key, region_config.secret_access_url)
+          env[:mos_compute] = Client.new(region_config.access_key, region_config.access_secret, region_config.access_ur)
 
           @app.call(env)
         end

data/lib/vagrant-mos/command.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
         region_config = machine.provider_config.get_region_config(region)
 
         @logger.info("Connecting to MOS...")
-        mos_compute = Client.new(region_config.access_key_id, region_config.secret_access_key, region_config.secret_access_url)
+        mos_compute = Client.new(region_config.access_key, region_config.access_secret, region_config.access_ur)
         results = mos_compute.describe_templates['Template']
         puts results
         0

data/lib/vagrant-mos/config.rb

@@ -6,7 +6,7 @@ module VagrantPlugins
       # The access key ID for accessing MOS.
       #
       # @return [String]
-      attr_accessor :access_key_id
+      attr_accessor :access_key
 
       # The ID of the image to use.
       #
@@ -46,15 +46,15 @@ module VagrantPlugins
       # The secret access key for accessing MOS.
       #
       # @return [String]
-      attr_accessor :secret_access_key
+      attr_accessor :access_secret
 
       # The secret access url for accessing MOS.
       #
       # @return [String]
-      attr_accessor :secret_access_url
+      attr_accessor :access_ur
 
       # Use IAM Instance Role for authentication to MOS instead of an
-      # explicit access_id and secret_access_key
+      # explicit access_id and access_secret
       #
       # @return [Boolean]
       attr_accessor :use_iam_profile
@@ -75,7 +75,7 @@ module VagrantPlugins
       attr_accessor :ssh_host_attribute
 
       def initialize(region_specific=false)
-        @access_key_id             = UNSET_VALUE
+        @access_key             = UNSET_VALUE
         @template_id                       = UNSET_VALUE
         @instance_ready_timeout    = UNSET_VALUE
         @name                      = UNSET_VALUE
@@ -83,8 +83,8 @@ module VagrantPlugins
         @keypair_name              = UNSET_VALUE
         @region                    = UNSET_VALUE
         @version                   = UNSET_VALUE
-        @secret_access_key         = UNSET_VALUE
-        @secret_access_url         = UNSET_VALUE
+        @access_secret         = UNSET_VALUE
+        @access_ur         = UNSET_VALUE
         @use_iam_profile           = UNSET_VALUE
         @terminate_on_shutdown     = UNSET_VALUE
         @ssh_host_attribute        = UNSET_VALUE
@@ -157,9 +157,9 @@ module VagrantPlugins
       def finalize!
         # Try to get access keys from standard MOS environment variables; they
         # will default to nil if the environment variables are not present.
-        @access_key_id     = ENV['MOS_ACCESS_KEY'] if @access_key_id     == UNSET_VALUE
-        @secret_access_key = ENV['MOS_SECRET_KEY'] if @secret_access_key == UNSET_VALUE
-        @secret_access_url = ENV['MOS_SECRET_URL'] if @secret_access_url == UNSET_VALUE
+        @access_key     = ENV['MOS_ACCESS_KEY'] if @access_key     == UNSET_VALUE
+        @access_secret = ENV['MOS_SECRET_KEY'] if @access_secret == UNSET_VALUE
+        @access_ur = ENV['MOS_SECRET_URL'] if @access_ur == UNSET_VALUE
 
         # Template_id must be nil, since we can't default that
         @template_id = nil if @template_id == UNSET_VALUE
@@ -226,12 +226,12 @@ module VagrantPlugins
           config = get_region_config(@region)
 
           if !config.use_iam_profile
-            errors << I18n.t("vagrant_mos.config.access_key_id_required") if \
-              config.access_key_id.nil?
-            errors << I18n.t("vagrant_mos.config.secret_access_key_required") if \
-              config.secret_access_key.nil?
-            errors << I18n.t("vagrant_mos.config.secret_access_url_required") if \
-              config.secret_access_url.nil?
+            errors << I18n.t("vagrant_mos.config.access_key_required") if \
+              config.access_key.nil?
+            errors << I18n.t("vagrant_mos.config.access_secret_required") if \
+              config.access_secret.nil?
+            errors << I18n.t("vagrant_mos.config.access_ur_required") if \
+              config.access_ur.nil?
           end
 
           errors << I18n.interpolate("vagrant_mos.config.template_id_required", :region => @region)  if config.template_id.nil?

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.9.20'
+    VERSION = '0.9.21'
   end
 end

data/locales/en.yml

@@ -39,18 +39,18 @@ en:
       was declined.
 
     config:
-      access_key_id_required: |-
-        An access key ID must be specified via "access_key_id"
+      access_key_required: |-
+        An access key ID must be specified via "access_key"
       template_id_required: |-
         An template_id must be configured via "template_id" (region: #{region})
       private_key_missing: |-
         The specified private key for MOS could not be found
       region_required: |-
         A region must be specified via "region"
-      secret_access_key_required: |-
-        A secret access key is required via "secret_access_key"
-      secret_access_url_required: |-
-        A secret access url is required via "secret_access_url"
+      access_secret_required: |-
+        A secret access key is required via "access_secret"
+      access_ur_required: |-
+        A secret access url is required via "access_ur"
 
     errors:
       mos_error: |-

data/spec/vagrant-mos/config_spec.rb

@@ -15,15 +15,15 @@ describe VagrantPlugins::MOS::Config do
       end
     end
 
-    its("access_key_id")     { should be_nil }
+    its("access_key")     { should be_nil }
     its("template_id")               { should be_nil }
     its("instance_ready_timeout") { should == 120 }
     its("name")     { should be_nil }
     its("instance_type")     { should == "C1_M2" }
     its("keypair_name")      { should be_nil }
     its("region")            { should == "us-east-1" }
-    its("secret_access_key") { should be_nil }
-    its("secret_access_url") { should be_nil }
+    its("access_secret") { should be_nil }
+    its("access_ur") { should be_nil }
     its("use_iam_profile")   { should be_false }
     its("terminate_on_shutdown") { should == false }
     its("ssh_host_attribute") { should be_nil }
@@ -34,9 +34,9 @@ describe VagrantPlugins::MOS::Config do
     # simple boilerplate test, so I cut corners here. It just sets
     # each of these attributes to "foo" in isolation, and reads the value
     # and asserts the proper result comes back out.
-    [:access_key_id, :template_id, :instance_ready_timeout,:name,
+    [:access_key, :template_id, :instance_ready_timeout,:name,
       :instance_type, :keypair_name, :ssh_host_attribute,
-      :region, :secret_access_key, :secret_access_url, :terminate_on_shutdown,
+      :region, :access_secret, :access_ur, :terminate_on_shutdown,
       :use_iam_profile].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
@@ -60,9 +60,9 @@ describe VagrantPlugins::MOS::Config do
         end
       end
 
-      its("access_key_id")     { should be_nil }
-      its("secret_access_key") { should be_nil }
-      its("secret_access_url")     { should be_nil }
+      its("access_key")     { should be_nil }
+      its("access_secret") { should be_nil }
+      its("access_ur")     { should be_nil }
     end
 
     context "with MOS credential environment variables" do
@@ -78,31 +78,31 @@ describe VagrantPlugins::MOS::Config do
         end
       end
 
-      its("access_key_id")     { should == "access_key" }
-      its("secret_access_key") { should == "secret_key" }
-      its("secret_access_url")     { should == "secret_url" }
+      its("access_key")     { should == "access_key" }
+      its("access_secret") { should == "secret_key" }
+      its("access_ur")     { should == "secret_url" }
     end
   end
 
   describe "region config" do
-    let(:config_access_key_id)     { "foo" }
+    let(:config_access_key)     { "foo" }
     let(:config_template_id)               { "foo" }
     let(:config_instance_type)     { "foo" }
     let(:config_name)     { "foo" }
     let(:config_keypair_name)      { "foo" }
     let(:config_region)            { "foo" }
-    let(:config_secret_access_key) { "foo" }
-    let(:config_secret_access_url)     { "foo" }
+    let(:config_access_secret) { "foo" }
+    let(:config_access_ur)     { "foo" }
 
     def set_test_values(instance)
-      instance.access_key_id     = config_access_key_id
+      instance.access_key     = config_access_key
       instance.template_id               = config_template_id
       instance.instance_type     = config_instance_type
       instance.name     = config_name
       instance.keypair_name      = config_keypair_name
       instance.region            = config_region
-      instance.secret_access_key = config_secret_access_key
-      instance.secret_access_url     = config_secret_access_url
+      instance.access_secret = config_access_secret
+      instance.access_ur     = config_access_ur
     end
 
     it "should raise an exception if not finalized" do
@@ -122,14 +122,14 @@ describe VagrantPlugins::MOS::Config do
         instance.get_region_config("us-east-1")
       end
 
-      its("access_key_id")     { should == config_access_key_id }
+      its("access_key")     { should == config_access_key }
       its("template_id")               { should == config_template_id }
       its("instance_type")     { should == config_instance_type }
       its("name")     { should == config_name }
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == config_region }
-      its("secret_access_key") { should == config_secret_access_key }
-      its("secret_access_url") { should == config_secret_access_url }
+      its("access_secret") { should == config_access_secret }
+      its("access_ur") { should == config_access_ur }
     end
 
     context "with a specific config set" do
@@ -148,14 +148,14 @@ describe VagrantPlugins::MOS::Config do
         instance.get_region_config(region_name)
       end
 
-      its("access_key_id")     { should == config_access_key_id }
+      its("access_key")     { should == config_access_key }
       its("template_id")               { should == config_template_id }
       its("instance_type")     { should == config_instance_type }
       its("name")     { should == config_name }
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == region_name }
-      its("secret_access_key") { should == config_secret_access_key }
-      its("secret_access_url") { should == config_secret_access_url }
+      its("access_secret") { should == config_access_secret }
+      its("access_ur") { should == config_access_ur }
     end
 
     describe "inheritance of parent config" do
@@ -168,7 +168,7 @@ describe VagrantPlugins::MOS::Config do
         end
 
         # Set some top-level values
-        instance.access_key_id = "parent"
+        instance.access_key = "parent"
         instance.template_id = "parent"
 
         # Finalize and get the region
@@ -176,7 +176,7 @@ describe VagrantPlugins::MOS::Config do
         instance.get_region_config(region_name)
       end
 
-      its("access_key_id") { should == "parent" }
+      its("access_key") { should == "parent" }
       its("template_id")           { should == "child" }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.21
 platform: ruby
 authors:
 - yangcs2009