rs-api-tools 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4717736cb349e30580a7156c8ffd3bc0b0cb0da2
-  data.tar.gz: 8d930782fc7a17806f99c54bbe16e195d17cf63f
+  metadata.gz: 45f18cd658df100eb7bef0207adc398ffeb1945a
+  data.tar.gz: cb60a3ea224758f7b1f17c683d2acd7af8aa0168
 SHA512:
-  metadata.gz: 61a8111ad10749625f245becf6afd99d2ebe77c1291d70fca8cdde45f242a26780912df5cec7a995f3fe060e9c29ac6c04a3b87ab4a89526f0ad57c3050b305c
-  data.tar.gz: a86803c4776080fdfa1344bd13357735a6d705256612dd00c49c1f806f4133ed9514e73c57b6ed1300a6c40c4060b41103963af95f713d7e027c9f232b9b820e
+  metadata.gz: b17711f8022e581bbd8737529b44ff6fdebe31d19315acc0fb4ddae66d5d99009c1d72ba091e2705f4c58f155c1043c2a7ed1f3ade9fb13e50e23319dfa0b920
+  data.tar.gz: 5520e871ad1f9478e8f47f78c5a0b78eff6eb3a15c2365be3b21b0a04aac39daf129871c8bbee005068c6c20b224367c2cb7489fb09e2df726c7c955c0beb19b

data/bin/rs-create-servertemplate

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 
 def usage
-  puts "usage: rs-create-servertemplate [--name <server_template_name>] --name <server_template_description>] [[--help]]"
+  puts "usage: rs-create-servertemplate [--name <server_template_name>] [--description <server_template_description>] [--metadata <rightscale_metadata>] [[--help]]"
   puts ''
   puts "See rs-create-servertemplate --help for more information on usage."
 end
@@ -28,6 +28,9 @@ server_template['name'] = false
 server_template['description'] = ''
 
 metadata = false
+import = true
+create_repo = true
+interactive = true
 verbose = false
 dry = false
 debug = false
@@ -36,10 +39,13 @@ help = false
 opts = GetoptLong.new(
   [ '--name', '-n', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--description', '-d', GetoptLong::OPTIONAL_ARGUMENT ],
-  [ '--metadata', '-m', GetoptLong::OPTIONAL_ARGUMENT],
-  [ '--verbose', '-v', GetoptLong::OPTIONAL_ARGUMENT ],
-  [ '--debug', '-D', GetoptLong::OPTIONAL_ARGUMENT ],
-  [ '--dry', GetoptLong::OPTIONAL_ARGUMENT ],
+  [ '--metadata', '-m', GetoptLong::OPTIONAL_ARGUMENT ],
+  [ '--no-import', GetoptLong::NO_ARGUMENT ],
+  [ '--non-interactive', GetoptLong::NO_ARGUMENT ],
+  [ '--no-create-repo', GetoptLong::NO_ARGUMENT ],
+  [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
+  [ '--debug', '-D', GetoptLong::NO_ARGUMENT ],
+  [ '--dry', GetoptLong::NO_ARGUMENT ],
   [ '--help', '-h', GetoptLong::NO_ARGUMENT ]
 )
 
@@ -51,6 +57,12 @@ opts.each do |opt, arg|
     server_template['description'] = arg
   when '--metadata'
     metadata = arg
+  when '--no-import'
+    import = false
+  when '--non-interactive'
+    interactive = false
+  when '--no-create-repo'
+    create_repo = false
   when '--help'
     help = true
   when '--verbose'
@@ -120,13 +132,19 @@ if metadata
     system("rs-tag-resource --href #{st.href} --tag '#{tag}'")
   }
 
-  # import multi-cloud images (if needed), and
+  # import multi-cloud images (if needed TODO), and
   # add multi-cloud images to server_template
   server_template['multi_cloud_images'].each { |mci|
     make_default = ''
-    puts "Import published MCI, #{mci['publication_id']} ? (y/n)"
-    import_mci = yesno
-    system("rs-import-publication --id #{mci['publication_id']}") if mci['publication_id'] if import_mci
+    if (import && mci['publication_id'])
+      if interactive
+        puts "Import published MCI, #{mci['publication_id']} ? (y/n)"
+        import_mci = yesno
+      else
+        import_mci = true
+      end
+      system("rs-import-publication --id #{mci['publication_id']}") if import_mci
+    end
     if mci['id']
       if mci['default']
         make_default = ' --default'
@@ -136,45 +154,84 @@ if metadata
   }
 
   # create cookbook repositories/import cookbooks
-  puts 'Do you need to create the Chef repositories ? (y/n)'
-  create_repos = yesno
-  if create_repos
-    if server_template['cookbooks'] == 'Cheffile'
+  if server_template['cookbooks'] == 'Cheffile'
+    require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'librarian_chef_dsl_parser'))
+    library = LibrarianChefDSLParser.new("#{Dir.pwd}/Cheffile")
+    create_repos = true
+    if interactive
+      puts 'Do you need to create the Chef cookbook repositories ? (y/n)'
+      create_repos = yesno
+    end
+    if (create_repos && create_repo)
       puts 'Setting up repositories from Cheffile.'
       system("rs-create-repositories --cheffile #{Dir.pwd}/Cheffile")
     end
-  end
-
-  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'librarian_chef_dsl_parser'))
-  library = LibrarianChefDSLParser.new("#{Dir.pwd}/Cheffile")
-
-  cookbook_hrefs = Array.new
-  library.cookbooks.each { |cookbook|
-    filter = Array.new
-    filter.push("name==#{cookbook['name']}")
-    filter.push("namespace==primary")
-    cookbooks = rightscale.cookbooks.index(:filter => filter).select{ |c|    
-      c.raw['source_info_summary'] == "#{cookbook['name']} #{cookbook['options'][:ref]}"
+    puts 'Determining cookbooks for ServerTemplate...'
+    cookbook_hrefs = Array.new
+    library.cookbooks.each { |cookbook|
+      filter = Array.new
+      filter.push("name==#{cookbook['name']}")
+      filter.push("namespace==primary")
+      puts "filter: #{filter}" if debug
+      cookbooks = rightscale.cookbooks.index(:filter => filter).select{ |c|    
+        c.raw['source_info_summary'] == "#{cookbook['name']} #{cookbook['options'][:ref]}"
+      }
+      cookbook_hrefs.push(cookbooks.first.href)
     }
-    puts cookbooks.first if debug
-    cookbook_hrefs.push(cookbooks.first.href)
-  }
-  puts "cookbook hrefs: #{cookbook_hrefs}"
-  # TODO: multi_attach
-  cookbook_hrefs.each { |href|
-    rightscale.server_templates(:id => st.href.split('/')[-1]).show.cookbook_attachments.create({ 'cookbook_attachment' => { 'cookbook_href' => "#{href}" }})
-  }
+    puts "cookbook hrefs: #{cookbook_hrefs}" if (verbose || debug)
+    # TODO: multi_attach
+    puts 'Attaching cookbooks to ServerTemplate.'
+    cookbook_hrefs.each { |href|
+      rightscale.server_templates(:id => st.href.split('/')[-1]).show.cookbook_attachments.create({ 'cookbook_attachment' => { 'cookbook_href' => "#{href}" }})
+    }
+  end
 
   # bind executables
   if server_template['boot_scripts'] == 'node.json'
     require 'json'
     recipes = JSON.parse(IO.read("#{Dir.pwd}/node.json"))['run_list'].map {|s| s.gsub('recipe[', '').gsub(']', '')}
     recipes.each { |recipe|
-      "Adding recipe, '#{recipe}' to boot scripts."
+      puts "Adding recipe, '#{recipe}' to boot scripts."
       system("rs-bind-executable --id #{st.href.split('/')[-1]} --recipe #{recipe}")
     }
   end
   
+  # configure inputs
+  if server_template['inputs'] == 'node.json'
+    puts 'Configuring inputs on ServerTemplate.'
+    require 'json'
+    node_attributes = JSON.parse(IO.read("#{Dir.pwd}/node.json")).reject{|k| k == 'run_list'}
+    inputs = Array.new
+    node_attributes.each { |cookbook, attrs|
+      node_attributes[cookbook].each { |key, val|
+        if val.kind_of?(String) || val.kind_of?(TrueClass) || val.kind_of?(FalseClass)
+          input = { "#{cookbook}/#{key}" => "text:#{val}" }
+          inputs.push(input)
+        elsif val.kind_of?(Array)
+          input = { "#{cookbook}/#{key}" => "array:#{val.join(',')}" }
+          inputs.push(input)
+        elsif val.kind_of?(Hash)
+          val.each { |sub_key, sub_val|
+            if sub_val.kind_of?(Array)
+              input = { "#{cookbook}/#{key}/#{sub_key}" => "array:#{sub_val.join(',')}" }
+            else
+              input = { "#{cookbook}/#{key}/#{sub_key}" => "text:#{sub_val}" }
+            end
+            inputs.push(input)
+          }
+        end
+      }
+    }
+    puts "inputs: #{inputs}" if debug
+    # bulk (needs testing)
+    #rightscale.server_templates(:id => st.href.split('/')[-1]).show.inputs.multi_update({ :inputs => inputs })
+    # individually
+    inputs.each { |i|
+      puts "Adding input, #{i.first[0]}=#{i.first[1]}." if verbose
+      system("rs-update-input --verbose --servertemplate --id #{st.href.split('/')[-1]} #{i.first[0].to_s} #{i.first[1].to_s}") 
+    }
+  end
+  
   # add alerts
   server_template['alerts'].each { |alert|
     system("rs-create-alert --resource ServerTemplate --id #{st.href.split('/')[-1]} --name '#{alert['name']}' --file '#{alert['file']}' --value '#{alert['value']}' --condition '#{alert['condition']}' --threshold '#{alert['threshold']}' --duration #{alert['duration']} --escalation '#{alert['escalation_name']}' --verbose")

data/bin/rs-update-input

@@ -4,26 +4,24 @@
 
 require 'rubygems'
 require 'getoptlong'
-require 'json'
-require 'rest_connection'
 
 def usage
-  puts("rs-set-input [[--current]] [--server --id <server_id> | --deployment --id <deployment_id>] <input_name> <input_value>")
-	puts 'e.g. rs-set-input --server'
+  puts("rs-update-input [[--current]] [--server --id <server_id> | --deployment --id <deployment_id>] <input_name> <input_value>")
+
 	exit
 end
 
 opts = GetoptLong.new(
-  [ '--current', '-c', GetoptLong::OPTIONAL_ARGUMENT ],
-  [ '--server', '-s', GetoptLong::OPTIONAL_ARGUMENT ],
-  [ '--deployment', '-d', GetoptLong::OPTIONAL_ARGUMENT ],
-  [ '--id', '-i', GetoptLong::OPTIONAL_ARGUMENT ],
-  [ '--name', '-n', GetoptLong::REQUIRED_ARGUMENT ],
-  [ '--value', '-V', GetoptLong::REQUIRED_ARGUMENT ],
-  [ '--verbose', '-v', GetoptLong::OPTIONAL_ARGUMENT ]
+  [ '--current', '-c', GetoptLong::NO_ARGUMENT ],
+  [ '--server', '-s', GetoptLong::NO_ARGUMENT ],
+  [ '--deployment', '-d', GetoptLong::NO_ARGUMENT ],
+  [ '--servertemplate', '-t', GetoptLong::NO_ARGUMENT ],
+  [ '--id', '-i', GetoptLong::REQUIRED_ARGUMENT ],
+  [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ]
 )
 
 server = false
+servertemplate = false
 name = false
 current = false
 deployment = false
@@ -41,14 +39,18 @@ opts.each do |opt, arg|
       server = true
     when '--deployment'
       deployment = true
+    when '--servertemplate'
+      servertemplate = true
 	  when '--id'
 		  id = arg
     when '--name'
       name = arg
+    when '--verbose'
+      verbose = true
   end
 end
 
-usage if !(server || deployment)
+usage if !(server || deployment || servertemplate)
 usage if !(id || name || ARGV[0] || ARGV[1])
 
 input_name = ARGV[0] if ARGV[0]
@@ -56,6 +58,7 @@ input_value = ARGV[1] if ARGV[1]
 
 # get server
 if server
+  require 'rest_connection'
   if name
     puts "Finding server: '%#{name}%'"
     server = Server.find(:first) { |s| s.nickname =~ /#{name}/ }
@@ -64,8 +67,18 @@ if server
   elsif id
     server = Server.find(server_id.to_i)
   end
+  # update input
+  server.reload_current() if current
+  server.set_input(input_name, input_value)
+elsif servertemplate
+  require 'yaml'
+  require 'right_api_client'
+  rightscale = RightApi::Client.new(YAML.load_file(File.join(ENV['HOME'], '.rightscale', 'right_api_client.yml')))
+  
+  inputs = Array.new
+  inputs.push({ 'name' => input_name })
+  inputs.push({ 'value' => input_value })
+  
+  puts "input: #{inputs}" if verbose
+  rightscale.server_templates(:id => id).show.inputs.multi_update({ :inputs => inputs })
 end
-
-# update input
-server.reload_current() if current
-server.set_input(input_name, input_value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rs-api-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Chris Fordham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -69,154 +69,154 @@ dependencies:
 description: RightScale API Command Line Tools.
 email: chris@fordham-nagy.id.au
 executables:
-- rs-create-alert
-- rs-describe-rightscripts
-- rs-tag-resource
-- rs-clone-server
-- rs-describe-instance
+- rs-bind-executable
 - rs-clone-deployment
-- rs-describe-cookbooks
-- rs-update-inputs
-- rs-start-server
-- rs-unlock-server
-- rs-describe-publications
-- rs-fetch-rightscripts
-- rs-describe-publication
-- rs-terminate-self
-- rs-describe-attached-vols
-- rs-describe-executables
-- rs-terminate-all
-- rs-describe-servers
-- rs-update-server-array
-- rs-create-repository
-- rs-fetch-executables
-- rs-relaunch-deployment
-- rs-run-all-boot-executables
-- rs-get-server-input
+- rs-clone-rightscript
+- rs-clone-server
+- rs-create-alert
+- rs-create-alert-spec
 - rs-create-org-repositories
+- rs-create-repositories
+- rs-create-repository
+- rs-create-servertemplate
+- rs-create-servertemplate-mci
+- rs-describe-alert-specs
+- rs-describe-alerts
+- rs-describe-attached-vols
+- rs-describe-cookbook
+- rs-describe-cookbooks
+- rs-describe-deployment
 - rs-describe-deployments
-- rs-ping-active-servers
-- rs-describe-key
 - rs-describe-ec2-ebs-snapshots
-- rs-describe-repositories
 - rs-describe-ec2-ebs-volumes
-- rs-bind-executable
-- rs-terminate-server
-- rs-run-recipe
-- rs-describe-servertemplates
-- rs-search-tags
-- rs-describe-keys
 - rs-describe-ec2-security-groups
-- rs-terminate-deployment
-- rs-create-servertemplate-mci
+- rs-describe-executables
+- rs-describe-instance
+- rs-describe-instances
+- rs-describe-key
+- rs-describe-keys
+- rs-describe-multi-cloud-images
+- rs-describe-publication
+- rs-describe-publications
+- rs-describe-repositories
 - rs-describe-rightscript
-- rs-reboot-server
-- rs-get-array-instances
+- rs-describe-rightscripts
+- rs-describe-server
+- rs-describe-server-array
 - rs-describe-server-arrays
-- rs-query-cloud
-- rs-describe-alert-specs
-- rs-launch-deployment
 - rs-describe-server-self
-- rs-describe-server
-- rs-create-alert-spec
-- rs-clone-rightscript
-- rs-relaunch-server
-- rs-update-input
-- rs-lock-server
-- rs-describe-instances
-- rs-start-deployment
-- rs-stop-server
-- rs-reboot-deployment
-- rs-describe-multi-cloud-images
-- rs-create-repositories
-- rs-launch-server
-- rs-describe-cookbook
+- rs-describe-servers
+- rs-describe-servertemplates
+- rs-fetch-executables
+- rs-fetch-rightscripts
+- rs-get-array-instances
+- rs-get-server-input
 - rs-get-server-monitoring
-- rs-run-rightscript
-- rs-describe-server-array
-- rs-tag-array
 - rs-get-server-sketchy-data
 - rs-import-publication
-- rs-describe-deployment
-- rs-create-servertemplate
-- rs-describe-alerts
+- rs-launch-deployment
+- rs-launch-server
+- rs-lock-server
+- rs-ping-active-servers
+- rs-query-cloud
+- rs-reboot-deployment
+- rs-reboot-server
+- rs-relaunch-deployment
+- rs-relaunch-server
+- rs-run-all-boot-executables
+- rs-run-recipe
+- rs-run-rightscript
+- rs-search-tags
+- rs-start-deployment
+- rs-start-server
 - rs-stop-deployment
+- rs-stop-server
+- rs-tag-array
+- rs-tag-resource
+- rs-terminate-all
+- rs-terminate-deployment
+- rs-terminate-self
+- rs-terminate-server
+- rs-unlock-server
+- rs-update-input
+- rs-update-inputs
+- rs-update-server-array
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/librarian_chef_dsl_parser.rb
-- bin/rs-create-alert
-- bin/rs-describe-rightscripts
-- bin/rs-tag-resource
-- bin/rs-clone-server
-- bin/rs-describe-instance
+- bin/rs-bind-executable
 - bin/rs-clone-deployment
-- bin/rs-describe-cookbooks
-- bin/rs-update-inputs
-- bin/rs-start-server
-- bin/rs-unlock-server
-- bin/rs-describe-publications
-- bin/rs-fetch-rightscripts
-- bin/rs-describe-publication
-- bin/rs-terminate-self
-- bin/rs-describe-attached-vols
-- bin/rs-describe-executables
-- bin/rs-terminate-all
-- bin/rs-describe-servers
-- bin/rs-update-server-array
-- bin/rs-create-repository
-- bin/rs-fetch-executables
-- bin/rs-relaunch-deployment
-- bin/rs-run-all-boot-executables
-- bin/rs-get-server-input
+- bin/rs-clone-rightscript
+- bin/rs-clone-server
+- bin/rs-create-alert
+- bin/rs-create-alert-spec
 - bin/rs-create-org-repositories
+- bin/rs-create-repositories
+- bin/rs-create-repository
+- bin/rs-create-servertemplate
+- bin/rs-create-servertemplate-mci
+- bin/rs-describe-alert-specs
+- bin/rs-describe-alerts
+- bin/rs-describe-attached-vols
+- bin/rs-describe-cookbook
+- bin/rs-describe-cookbooks
+- bin/rs-describe-deployment
 - bin/rs-describe-deployments
-- bin/rs-ping-active-servers
-- bin/rs-describe-key
 - bin/rs-describe-ec2-ebs-snapshots
-- bin/rs-describe-repositories
 - bin/rs-describe-ec2-ebs-volumes
-- bin/rs-bind-executable
-- bin/rs-terminate-server
-- bin/rs-run-recipe
-- bin/rs-describe-servertemplates
-- bin/rs-search-tags
-- bin/rs-describe-keys
 - bin/rs-describe-ec2-security-groups
-- bin/rs-terminate-deployment
-- bin/rs-create-servertemplate-mci
+- bin/rs-describe-executables
+- bin/rs-describe-instance
+- bin/rs-describe-instances
+- bin/rs-describe-key
+- bin/rs-describe-keys
+- bin/rs-describe-multi-cloud-images
+- bin/rs-describe-publication
+- bin/rs-describe-publications
+- bin/rs-describe-repositories
 - bin/rs-describe-rightscript
-- bin/rs-reboot-server
-- bin/rs-get-array-instances
+- bin/rs-describe-rightscripts
+- bin/rs-describe-server
+- bin/rs-describe-server-array
 - bin/rs-describe-server-arrays
-- bin/rs-query-cloud
-- bin/rs-describe-alert-specs
-- bin/rs-launch-deployment
 - bin/rs-describe-server-self
-- bin/rs-describe-server
-- bin/rs-create-alert-spec
-- bin/rs-clone-rightscript
-- bin/rs-relaunch-server
-- bin/rs-update-input
-- bin/rs-lock-server
-- bin/rs-describe-instances
-- bin/rs-start-deployment
-- bin/rs-stop-server
-- bin/rs-reboot-deployment
-- bin/rs-describe-multi-cloud-images
-- bin/rs-create-repositories
-- bin/rs-launch-server
-- bin/rs-describe-cookbook
+- bin/rs-describe-servers
+- bin/rs-describe-servertemplates
+- bin/rs-fetch-executables
+- bin/rs-fetch-rightscripts
+- bin/rs-get-array-instances
+- bin/rs-get-server-input
 - bin/rs-get-server-monitoring
-- bin/rs-run-rightscript
-- bin/rs-describe-server-array
-- bin/rs-tag-array
 - bin/rs-get-server-sketchy-data
 - bin/rs-import-publication
-- bin/rs-describe-deployment
-- bin/rs-create-servertemplate
-- bin/rs-describe-alerts
+- bin/rs-launch-deployment
+- bin/rs-launch-server
+- bin/rs-lock-server
+- bin/rs-ping-active-servers
+- bin/rs-query-cloud
+- bin/rs-reboot-deployment
+- bin/rs-reboot-server
+- bin/rs-relaunch-deployment
+- bin/rs-relaunch-server
+- bin/rs-run-all-boot-executables
+- bin/rs-run-recipe
+- bin/rs-run-rightscript
+- bin/rs-search-tags
+- bin/rs-start-deployment
+- bin/rs-start-server
 - bin/rs-stop-deployment
+- bin/rs-stop-server
+- bin/rs-tag-array
+- bin/rs-tag-resource
+- bin/rs-terminate-all
+- bin/rs-terminate-deployment
+- bin/rs-terminate-self
+- bin/rs-terminate-server
+- bin/rs-unlock-server
+- bin/rs-update-input
+- bin/rs-update-inputs
+- bin/rs-update-server-array
 homepage: https://github.com/flaccid/rs-api-tools
 licenses:
 - Apache 2