right_link 5.9.2 → 5.9.5

data/lib/instance/right_scripts_cookbook.rb

@@ -68,11 +68,11 @@ module RightScale
       recipe_name = File.basename(path)
       @recipes[recipe_name] = script.nickname
       recipe_content = <<-EOS
-right_script '#{script.nickname.gsub("'", "\\\\'")}' do
-  parameters(node["#{script.nickname}"]["parameters"])
+right_script #{script.nickname.inspect} do
+  parameters(node[#{script.nickname.inspect}]["parameters"])
   cache_dir  '#{cache_dir(script)}'
   source_file '#{path}'
-  display_version '#{script.display_version.to_s.strip.gsub("'", "\\\\'")}'
+  display_version #{script.display_version.to_s.strip.inspect}
 end
       EOS
       File.open(path, 'w') { |f| f.puts script.source }

data/lib/repo_conf_generators/yum_conf_generators.rb

@@ -116,10 +116,11 @@ module Yum
     arch = Yum::execute("uname -i").strip
 
     major_ver = ver.strip.split(".").first
-    repo_path = "#{major_ver}/#{opts[:repo_subpath]}/#{arch}"
 
     opts = { :enabled => true, :gpgkey_file => RPM_GPG_KEY_CentOS + major_ver, :frozen_date => "latest"}
     opts.merge!(params)
+    repo_path = "#{major_ver}/#{opts[:repo_subpath]}/#{arch}"
+
     raise "missing parameters to generate file!" unless opts[:repo_filename] && opts[:repo_name] && opts[:repo_subpath] &&
                                                         opts[:base_urls] && opts[:frozen_date] && opts[:enabled] && opts[:gpgkey_file]
     # Old CentOS versions 5.0 and 5.1 were not versioned...so we just point to the base of the repo instead.

data/lib/right_link/version.rb

@@ -1,4 +1,8 @@
 module RightLink
-  VERSION = "5.9.2"
+  module_function
+
+  def version
+    Gem.loaded_specs['right_link'].version.to_s
+  end
 end
 

data/scripts/bundle_runner.rb

@@ -100,7 +100,7 @@ module RightScale
       cmd[:name] = options[:bundle_type] == :right_script ? 'run_right_script' : 'run_recipe'
       AgentConfig.cfg_dir = options[:cfg_dir]
 
-      exit_code = true 
+      exit_code = true
       callback ||= lambda do |r|
         response = serialize_operation_result(r) rescue nil
         if r == 'OK'
@@ -120,7 +120,7 @@ module RightScale
       rescue Exception => e
         fail(e.message)
       end
-      exit_code 
+      exit_code
     rescue SystemExit => e
       raise e
     rescue Exception => e
@@ -257,7 +257,7 @@ protected
       end
       result
     end
-    
+
     # Version information
     #
     # === Return

data/scripts/command_helper.rb

@@ -1,3 +1,8 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'right_link/version'
+require 'right_agent/scripts/usage'
+
 module RightScale
   module CommandHelper
     def check_privileges
@@ -55,7 +60,7 @@ module RightScale
     #
     # === Return
     # R.I.P. does not return
-    def fail(reason=nil)
+    def fail(reason=nil, print_usage=false)
       case reason
       when Errno::EACCES
         STDERR.puts reason.message
@@ -63,7 +68,7 @@ module RightScale
         code = 2
       when Exception
         STDERR.puts reason.message
-        code = reason.respond_to(:code) ? reason.code : 50
+        code = reason.respond_to?(:code) ? reason.code : 50
       when String
         STDERR.puts reason
         code = 50
@@ -73,6 +78,7 @@ module RightScale
         code = 1
       end
 
+      puts usage if print_usage
       exit(code)
     end
 
@@ -86,7 +92,7 @@ module RightScale
         STDOUT.puts(usage)
         succeed
       rescue Trollop::CommandlineError => e
-        puts e.message + "\nUse --help for additional information"
+        STDERR.puts e.message + "\nUse --help for additional information"
         fail
       rescue SystemExit => e
         raise e
@@ -94,8 +100,7 @@ module RightScale
     end
 
     def right_link_version
-      gemspec = eval(File.read(File.join(File.dirname(__FILE__), '..', 'right_link.gemspec')))
-      gemspec.version
+      RightLink.version
     end
   end
 end

data/scripts/log_level_manager.rb

@@ -17,7 +17,7 @@
 #
 #    Options:
 #      --log-level, -l LVL  Set log level(for Chef/RightScript by default)
-#      --agent              Set/get log level of RightLink agent
+#      --agent, -a          Set/get log level of RightLink agent
 #      --verbose, -v        Display debug information
 #      --help:              Display help
 #      --version:           Display version information
@@ -97,7 +97,7 @@ module RightScale
         options
       end
     end
-    
+
 protected
 
     # Writes to STDOUT (and a placeholder for spec mocking).

data/scripts/reenroller.rb

@@ -41,6 +41,7 @@ module RightScale
     # === Return
     # true:: Always return true
     def run(options)
+      check_privileges
       AgentConfig.root_dir = AgentConfig.right_link_root_dirs
 
       if RightScale::Platform.windows?
@@ -81,10 +82,6 @@ module RightScale
         res = system("/etc/init.d/rightlink #{action} > /dev/null")
       end
       true
-    rescue Errno::EACCES => e
-      STDERR.puts e.message
-      STDERR.puts "Try elevating privilege (sudo/runas) before invoking this command."
-      exit(2)
     end
 
     # Create options hash from command line arguments
@@ -149,7 +146,7 @@ module RightScale
     rescue Errno::ESRCH
       false
     end
-    
+
     # Version information
     #
     # === Return

data/scripts/shutdown_client.rb

@@ -25,7 +25,6 @@
 #      --help:            Display help
 #      --version:         Display version information
 #
-#    No options prints the current RightLink agent log level
 #
 
 require 'rubygems'

data/scripts/state_controller.rb

@@ -0,0 +1,98 @@
+# === Synopsis:
+#   RightScale run state reporter (rs_state) - (c) 2013 RightScale Inc
+#
+#   Report current run state of an instance
+#
+# === Examples:
+#   Print the run state:
+#   rs_state --type=run
+#   Possible values: booting, booting:reboot, operational, stranded,
+#                    shutting-down:reboot, shutting-down:terminate, shutting-down:stop
+#
+#   Print the agent state:
+#   rs_state --type=agent
+#   Possible values: pending, booting, operational, stranded, decommissioning, decommissioned
+#
+# === Usage
+#    rs_state --type <type>
+#
+#    Options:
+#      --type, -t TYPE  Display desired state(run or agent)
+#      --help:          Display help
+#      --version:       Display version information
+#
+#
+require 'trollop'
+require 'right_agent'
+require File.expand_path(File.join(File.dirname(__FILE__), 'command_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'instance', 'json_utilities'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'instance', 'agent_config'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'instance', 'instance_state'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'instance', 'shutdown_request'))
+
+module RightScale
+
+  class RightLinkStateController
+    include CommandHelper
+
+    def self.run
+      m = RightLinkStateController.new
+      m.control(m.parse_args)
+    end
+
+    def silence_stdout
+      save_stdout = STDOUT.dup
+      STDOUT.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+      STDOUT.sync = true
+      yield
+    ensure
+      STDOUT.reopen(save_stdout)
+    end
+
+    def control(options)
+      silence_stdout { InstanceState.init(nil, true) } # RightScale::Log will log to STDOUT if no log file is provided
+      result = case options[:type]
+               when 'run'
+                 case InstanceState.value
+                 when 'booting'
+                   "booting#{InstanceState.reboot? ? ':reboot' : ''}"
+                 when 'operational'
+                   "operational"
+                 when 'stranded'
+                   "stranded"
+                 when 'decommissioning', 'decommissioned'
+                   decom_reason = "unknown"
+                   decom_reason = InstanceState.decommission_type if ShutdownRequest::LEVELS.include?(InstanceState.decommission_type)
+                   "shutting-down:#{decom_reason}"
+                 end
+               when 'agent'
+                 InstanceState.value
+               end
+      fail("Failed to get #{options[:type]} state") unless result
+      puts result
+    rescue Exception => e
+      fail(e)
+    end
+
+    def parse_args
+      parser = Trollop::Parser.new do
+        opt :type, "", :type => :string
+        version ""
+      end
+      parse do
+        options = parser.parse
+        fail("No type specified on the command line.") unless options[:type]
+        fail("Unknown state type '#{options[:type]}'. Use 'run' or 'agent'") unless ['run', 'agent'].include?(options[:type])
+        options
+      end
+    end
+
+    def usage
+      Usage.scan(__FILE__)
+    end
+
+    def version
+      "rs_state #{right_link_version} - RightLink's run state reporter(c) 2013 RightScale"
+    end
+  end
+end

data/scripts/system_configurator.rb

@@ -357,5 +357,9 @@ module RightScale
     def unset_proxy_variables
       runshell("unset http_proxy ; unset HTTP_PROXY ; unset no_proxy; unset NO_PROXY")
     end
+
+    def usage
+      Usage.scan(__FILE__)
+    end
   end
 end

data/scripts/tagger.rb

@@ -2,7 +2,7 @@
 #   RightScale Tagger (rs_tag) - (c) 2009-2013 RightScale Inc
 #
 #   Tagger allows listing, adding and removing tags on the current instance and
-#   querying for all instances with a given set of tags
+#   querying for instances with a given set of tags
 #
 # === Examples:
 #   Retrieve all tags:
@@ -17,9 +17,9 @@
 #     rs_tag --remove a_tag
 #     rs_tag -r a_tag
 #
-#   Retrieve all instances with any of the tags in a set:
-#     rs_tag --query "a_tag b_tag"
-#     rs_tag -q "a_tag b_tag"
+#   Retrieve instances with any of the tags in a set:
+#     rs_tag --query "a_tag b:machine=tag"
+#     rs_tag -q "a_tag b:machine=tag"
 #
 # === Usage
 #    rs_tag (--list, -l | --add, -a TAG | --remove, -r TAG | --query, -q TAG_LIST)
@@ -28,8 +28,8 @@
 #      --list, -l           List current server tags
 #      --add, -a TAG        Add tag named TAG
 #      --remove, -r TAG     Remove tag named TAG
-#      --query, -q TAG_LIST Query for all instances that have any of the tags in TAG_LIST
-#                           with the TAG_LIST being quoted if it contains spaces
+#      --query, -q TAG_LIST Query for instances that have any of the tags in TAG_LIST
+#                           with the TAG_LIST being quoted if it contains spaces used as delimiter
 #      --die, -e            Exit with error if query/list fails
 #      --format, -f FMT     Output format: json, yaml, text
 #      --verbose, -v        Display debug information
@@ -228,11 +228,13 @@ protected
       STDERR.puts(message)
     end
 
-    # Splits the TAG_LIST parameter on space unless an equals is present in
-    # order to support both the "x:y a:b" and the "x:y=a b c" (tag value
-    # contains space(s)) cases. the "x:y=a b c:d=x y" case is ambiguous and will
-    # be interpreted as follows:
-    #   namespace=x, name=y, value=a b c:d=x y
+    # Splits the TAG_LIST parameter on tags
+    # ATTENTION: Tag value should not contains space(s)).
+    # The "x:y=a b c:d=x y" case will be interpreted as 4 tags:
+    #   1. namespace=x, predicate=y, value=a
+    #   2. b
+    #   3. namespace=c, predicate=d, value=x
+    #   4. y
     #
     # === Parameters
     # @param [String] tag_list to parse
@@ -240,12 +242,7 @@ protected
     # === Return
     # @return [Array] tags to query
     def parse_tag_list(tag_list)
-      tag_list = tag_list.to_s
-      if tag_list.index('=')
-        [tag_list.strip]
-      else
-        tag_list.split
-      end
+      tag_list = tag_list.to_s.strip.split
     end
 
     # Format output for display to user

data/scripts/thunker.rb

@@ -54,10 +54,10 @@ module RightScale
     # === Return
     # true:: Always return true
     def run(options)
-      check_privileges
       @log_sink = StringIO.new
       @log = Logger.new(@log_sink)
       RightScale::Log.force_logger(@log)
+      check_privileges
 
       username  = options.delete(:username)
       email     = options.delete(:email)
@@ -86,14 +86,11 @@ module RightScale
       # Create user just-in-time; idempotent if user already exists
       # Note that username == chosen here, they just get used in two different contexts
       username = LoginUserManager.create_user(username, uuid, superuser ? true : false) do |chosen|
-        if :shell == access
-          puts "Creating your user profile (#{chosen}) on this machine."
-        end
+          puts "Creating your user profile (#{chosen}) on this machine." if (:shell == access)
       end
 
       create_audit_entry(email, username, access, orig, client_ip)
       chown_tty(username)
-      create_profile(access, username, profile, force) if profile
 
       # Note that when execing sudo we use the N-argument form of Kernel.exec,
       # which does not invoke a shell, but rather directly invokes the command specified
@@ -174,13 +171,19 @@ module RightScale
     # R.I.P. does not return
     def fail(reason=nil, options={})
       case reason
+      when Errno::EACCES
+        STDERR.puts reason.message
+        STDERR.puts "Try elevating privilege (sudo/runas) before invoking this command."
+        code = 2
       when Exception
         STDOUT.puts "Unexpected #{reason.class.name}: #{reason.message}"
         STDOUT.puts "We apologize for the inconvenience. You may try connecting as root"
         STDOUT.puts "to work around this problem, if you have sufficient privilege."
-        STDERR.puts
-        STDERR.puts("Debugging information:")
-        STDERR.puts(@log_sink.string)
+        unless @log_sink.string.empty?
+          STDERR.puts
+          STDERR.puts("Debugging information:")
+          STDERR.puts(@log_sink.string)
+        end
         code = 50
       when String
         STDOUT.puts reason
@@ -254,25 +257,6 @@ module RightScale
       false
     end
 
-    # Download an archive from given path; extracts files and moves
-    # them to username's home directory.
-    #
-    # === Parameters
-    # username(String):: account's username
-    # custom_data(String):: custom data, e.g. personal tarball URL
-    # force(Boolean):: rewrite existing files if true; otherwise skip them
-    #
-    # === Return
-    # extracted(Boolean):: true if profile downloaded and copied; false
-    # if profile has been created earlier or error occured
-    def create_profile(access, username, custom_data, force = false)
-      home_dir = Etc.getpwnam(username).dir
-
-      LoginUserManager.setup_profile(username, home_dir, custom_data, force) do |msg|
-        puts msg if [:command, :shell].include?(access)
-      end
-    end
-
     # Display the Message of the Day if it exists.
     def display_motd
       if File.exist?(MOTD)
@@ -307,7 +291,7 @@ module RightScale
     def usage
       Usage.scan(__FILE__)
     end
-    
+
   end # Thunker
 
 end # RightScale

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_link
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 5
   - 9
-  - 2
-  version: 5.9.2
+  - 5
+  version: 5.9.5
 platform: ruby
 authors: 
 - RightScale
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-07 00:00:00 -07:00
-default_executable: 
+date: 2013-12-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: right_agent
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,12 +30,12 @@ dependencies:
         - 0
         - 10
         version: "0.10"
-  requirement: *id001
   type: :runtime
-  name: right_agent
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: right_scraper
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,12 +45,12 @@ dependencies:
         - 3
         - 2
         version: "3.2"
-  requirement: *id002
   type: :runtime
-  name: right_scraper
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: right_popen
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,12 +60,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  requirement: *id003
   type: :runtime
-  name: right_popen
-  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: right_http_connection
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,12 +75,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  requirement: *id004
   type: :runtime
-  name: right_http_connection
-  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: right_support
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,12 +90,12 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  requirement: *id005
   type: :runtime
-  name: right_support
-  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: chef
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,12 +106,12 @@ dependencies:
         - 10
         - 10
         version: 0.10.10
-  requirement: *id006
   type: :runtime
-  name: chef
-  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: encryptor
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -120,12 +121,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  requirement: *id007
   type: :runtime
-  name: encryptor
-  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: trollop
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -134,12 +135,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
   type: :runtime
-  name: trollop
-  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: extlib
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -150,10 +151,8 @@ dependencies:
         - 9
         - 15
         version: 0.9.15
-  requirement: *id009
   type: :runtime
-  name: extlib
-  prerelease: false
+  version_requirements: *id009
 description: A daemon that connects systems to the RightScale cloud management platform.
 email: support@rightscale.com
 executables: 
@@ -171,6 +170,7 @@ executables:
 - rs_run_recipe
 - rs_run_right_script
 - rs_shutdown
+- rs_state
 - rs_tag
 - rs_thunk
 - rstat
@@ -204,6 +204,7 @@ files:
 - bin/rs_run_recipe
 - bin/rs_run_right_script
 - bin/rs_shutdown
+- bin/rs_state
 - bin/rs_tag
 - bin/rs_thunk
 - bin/rstat
@@ -301,7 +302,6 @@ files:
 - lib/clouds/clouds/google.rb
 - lib/clouds/clouds/none.rb
 - lib/clouds/clouds/openstack.rb
-- lib/clouds/clouds/rackspace-ng.rb
 - lib/clouds/clouds/rackspace.rb
 - lib/clouds/clouds/softlayer.rb
 - lib/clouds/metadata_formatter.rb
@@ -380,11 +380,11 @@ files:
 - scripts/reenroller.rb
 - scripts/server_importer.rb
 - scripts/shutdown_client.rb
+- scripts/state_controller.rb
 - scripts/system_configurator.rb
 - scripts/tagger.rb
 - scripts/thunker.rb
 - lib/instance/cook/ca-bundle.crt
-has_rdoc: true
 homepage: https://github.com/rightscale/right_link
 licenses: []
 
@@ -416,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: RightScale management agent.