zaws 0.0.5 → 0.1.1

data/bin/win_zaws.bat

@@ -0,0 +1,2 @@
+@echo off
+bundle exec zaws %* 

data/lib/zaws.rb

@@ -1,56 +1,69 @@
-require "zaws/version"
-require "zaws/helper/option"
-require "zaws/helper/output"
-require "zaws/helper/shell"
-require "zaws/helper/zfile"
-require "zaws/command/subnet"
-require "zaws/command/security_group"
-require "zaws/command/route_table"
-require "zaws/command/compute"
-require "zaws/command/elasticip"
-require "zaws/command/load_balancer"
-require "zaws/command/hosted_zone"
-require "zaws/aws"
-require "zaws/ec2"
-require "zaws/elb"
-require "zaws/route53"
-require "zaws/ec2/subnet"
-require "zaws/ec2/security_group"
-require "zaws/ec2/route_table"
-require "zaws/ec2/compute"
-require "zaws/ec2/elasticip"
-require "zaws/elb/load_balancer"
-require "zaws/route53/hosted_zone"
 require "thor"
+Dir["#{File.dirname(__FILE__)}/zaws/**/*.rb"].each { |item| load(item) }
 
 module ZAWS
   class ZAWSCLI < Thor
 
-	desc "subnet","ec2 subnet(s)"
-	subcommand "subnet",ZAWS::Command::Subnet
+    attr_accessor :out
 
-	desc "security_group","ec2 security group(s)"
-	subcommand "security_group",ZAWS::Command::Security_Group
+    def initialize(*args)
+      super
+      @out = $stdout
+    end
 
-	desc "route_table","ec2 route table(s)"
-	subcommand "route_table",ZAWS::Command::Route_Table
+    desc "subnet", "ec2 subnet(s)"
+    subcommand "subnet", ZAWS::Command::Subnet
 
-	desc "compute","ec2 compute instance(s)"
-	subcommand "compute",ZAWS::Command::Compute
+    desc "security_group", "ec2 security group(s)"
+    subcommand "security_group", ZAWS::Command::Security_Group
 
-        desc "elasticip","ec2 elasticip(s)"
-	subcommand "elasticip",ZAWS::Command::Elasticip
+    desc "route_table", "ec2 route table(s)"
+    subcommand "route_table", ZAWS::Command::Route_Table
 
-        desc "load_balancer","elb load balancer(s)"
-	subcommand "load_balancer",ZAWS::Command::Load_Balancer
+    desc "compute", "ec2 compute instance(s)"
+    subcommand "compute", ZAWS::Command::Compute
 
-        desc "hosted_zone","elb hosted_zone(s)"
-	subcommand "hosted_zone",ZAWS::Command::Hosted_Zone
+    desc "elasticip", "ec2 elasticip(s)"
+    subcommand "elasticip", ZAWS::Command::Elasticip
 
-	desc "version","Get the version of the Zynx AWS Automation Tool."
-	def version
-	  puts "zaws version #{ZAWS::VERSION}"
-	end
+    desc "load_balancer", "elb load balancer(s)"
+    subcommand "load_balancer", ZAWS::Command::Load_Balancer
+
+    desc "hosted_zone", "elb hosted_zone(s)"
+    subcommand "hosted_zone", ZAWS::Command::Hosted_Zone
+
+    desc "cloud_trail", "aws cloud trail"
+    subcommand "cloud_trail", ZAWS::Command::CloudTrail
+
+    desc "bucket", "S3 storage bucket(s)"
+    subcommand "bucket", ZAWS::Command::Bucket
+
+    desc "iam", "iam access control"
+    subcommand "iam", ZAWS::Command::IAM
+
+    desc "vpc", "virtual private cloud (or vpc)"
+    subcommand "vpc", ZAWS::Command::Vpc
+
+    desc "nessus", "tennable nessus"
+    subcommand "nessus", ZAWS::Command::Nessus
+
+    desc "ai", "artificial intelligence"
+    subcommand "ai", ZAWS::Command::Ai
+
+    desc "sumo", "sumologic"
+    subcommand "sumo", ZAWS::Command::Sumo
+
+    desc "newrelic", "newrelic"
+    subcommand "newrelic", ZAWS::Command::Newrelic
+
+    desc "config", "config"
+    subcommand "config", ZAWS::Command::Config
+
+    desc "version", "Get the version of the Zynx AWS Automation Tool."
+
+    def version
+      @out.puts "zaws version #{ZAWS::VERSION}"
+    end
 
   end
 end

data/lib/zaws/command/ai.rb

@@ -0,0 +1,34 @@
+require 'thor'
+
+module ZAWS
+  module Command
+    class Ai < Thor
+      class_option :verbose, :type => :boolean, :desc => "Verbose outout", :aliases => :d, :default => false
+
+      attr_accessor :ai
+      attr_accessor :out
+      attr_accessor :print_exit_code
+
+      def initialize(*args)
+        super
+        shellout=ZAWS::Helper::Shell.new
+        nessusapi = ZAWS::Nessusapi.new(shellout)
+        sumoapi = ZAWS::Sumoapi.new(shellout)
+        newrelicapi = ZAWS::Newrelicapi.new(shellout)
+        awscli = ZAWS::AWSCLI.new(shellout)
+        @ai = ZAWS::Controllers::AI.new(shellout, nessusapi,sumoapi,newrelicapi,awscli)
+        @out = $stdout
+        @print_exit_code = false
+      end
+
+      desc "query", "query"
+      option :home, :type => :string, :default => ENV['HOME'], :desc => 'Home directory location for credentials file'
+      def query(*value)
+        @ai.awscli.home=options[:home]
+        value = [value] if value.instance_of?(String)
+        @out.puts(@ai.query.all(options[:home], options[:verbose],value))
+      end
+
+    end
+  end
+end

data/lib/zaws/command/bucket.rb

@@ -0,0 +1,35 @@
+require 'thor'
+
+module ZAWS
+  module Command
+    class Bucket < Thor
+      class_option :region, :type => :string, :desc => "AWS Region", :banner => "<region>", :aliases => :r, :required => true
+
+      attr_accessor :aws
+      attr_accessor :out
+      attr_accessor :print_exit_code
+
+      def initialize(*args)
+        super
+        shellout=ZAWS::Helper::Shell.new
+        awscli = ZAWS::AWSCLI.new(shellout)
+        @aws = ZAWS::AWS.new(shellout, awscli)
+        @out = $stdout
+        @print_exit_code = false
+      end
+
+      desc "declare BUCKET_NAME", "declare an S3 bucket."
+
+      def declare(name)
+        @aws.s3.bucket.declare(name, options[:region], @out)
+      end
+
+      desc "sync BUCKET_NAME[/PATH]", "download the contents of an S3 bucket."
+      option :dest, :type => :string, :desc => "directory to save to.", :aliases => :d
+
+      def sync(bucket_name)
+        @aws.s3.bucket.sync(options[:region], bucket_name, options[:dest])
+      end
+    end
+  end
+end

data/lib/zaws/command/cloud_trail.rb

@@ -0,0 +1,43 @@
+require 'thor'
+
+module ZAWS
+  module Command
+	class CloudTrail < Thor
+	  class_option :region, :type => :string, :desc => "AWS Region", :banner => "<region>",  :aliases => :r, :required => true
+
+	  attr_accessor :aws
+      attr_accessor :out
+      attr_accessor :print_exit_code
+
+	  def initialize(*args)
+		super
+        shellout=ZAWS::Helper::Shell.new
+		awscli = ZAWS::AWSCLI.new(shellout)
+		@aws = ZAWS::AWS.new(shellout,awscli)
+		@out = $stdout
+		@print_exit_code = false
+	  end
+
+
+	  desc "view","View a cloud trail"
+    option :trailName, :type => :string, :desc => "Name of the cloud trail to view", :aliases => :n
+    option :bucket, :type => :string, :desc => "Name of the bucket where the cloud trail is stored", :aliases => :b
+    option :raw, :type => :boolean, :desc => "Return the cloud trail in its raw, json format", :aliases => :w, :default => false
+    def view
+      if options[:bucket]
+        @aws.cloud_trail.get_cloud_trail_by_bucket(options[:region], options[:bucket], options[:raw], options[:verbose]?$stdout:nil)
+      else
+        @aws.cloud_trail.get_cloud_trail_by_name(options[:region], options[:trailName] ? options[:trailName] : 'default', options[:raw], options[:verbose]?@out:nil)
+      end
+    end
+
+    desc "declare TRAIL_NAME","Declare a cloud trail"
+    option :bucket, :type => :string, :desc => "Name of the bucket where the cloud trail is to be stored", :aliases => :b
+    def declare(name)
+      @aws.cloud_trail.declare(name,options[:region],options[:bucket] ? options[:bucket] : "zaws-cloudtrail-#{name}")
+    end
+	end
+  end
+end
+
+

data/lib/zaws/command/compute.rb

@@ -2,98 +2,163 @@ require 'thor'
 
 module ZAWS
   module Command
-	class Compute < Thor 
-	  class_option :region, :type => :string, :desc => "AWS Region", :banner => "<region>",  :aliases => :r, :required => true
-	  class_option :verbose, :type => :boolean, :desc => "Verbose outout", :aliases => :d, :default => false
-
-	  desc "view","View compute instances."
-	  option :viewtype, :type => :string, :desc => "View type, json or table", :banner => "<viewtype>", :aliases => :w, :default => "table"
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def view
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.compute.view(options[:region],options[:viewtype],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid])
-	  end
-
-	  desc "view_images","View images, by default the images are owned by self (your account))."
-	  option :viewtype, :type => :string, :desc => "View type, json or table", :banner => "<viewtype>", :aliases => :w, :default => "table"
+    class Compute < Thor
+      class_option :region, :type => :string, :desc => "AWS Region", :banner => "<region>", :aliases => :r, :required => true
+      class_option :verbose, :type => :boolean, :desc => "Verbose outout", :aliases => :d, :default => false
+
+      attr_accessor :aws
+      attr_accessor :out
+      attr_accessor :print_exit_code
+
+      def initialize(*args)
+        super
+        shellout=ZAWS::Helper::Shell.new
+        awscli = ZAWS::AWSCLI.new(shellout,false)
+        @aws = ZAWS::AWS.new(shellout, awscli)
+        @out = $stdout
+        @print_exit_code = false
+      end
+
+      desc "view", "View compute instances."
+      option :viewtype, :type => :string, :desc => "View type, json or table", :banner => "<viewtype>", :aliases => :w, :default => "table"
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+      option :profile, :type => :string, :desc => "AWS Profile", :banner => "<profile>", :aliases => :p, :default => nil
+      option :home, :type => :string, :default => ENV['HOME'], :desc => 'Home directory location for credentials file'
+      def view
+        region =options[:region]
+        viewtype=options[:viewtype]
+        verbose=(options[:verbose] ? @out : nil)
+        vpcid=options[:vpcid]
+        profile=options[:profile]
+        home=options[:home]
+        @aws.ec2.compute.view(region, viewtype, @out, verbose, vpcid,nil, profile,home)
+      end
+
+      desc "view_images", "View images, by default the images are owned by self (your account))."
+      option :viewtype, :type => :string, :desc => "View type, json or table", :banner => "<viewtype>", :aliases => :w, :default => "table"
       option :owner, :type => :string, :desc => "filter by owner of the images", :banner => "<owner>", :aliases => :o, :default => "self"
-      option :imageid, :type => :string, :desc => "filter by owner of the images", :banner => "<imageid>", :aliases => :i, :default => nil 
-	  def view_images
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.compute.view_images(options[:region],options[:viewtype],options[:owner],options[:imageid],$stdout,(options[:verbose]?$stdout:nil))
-	  end
-
-      desc "exists_by_external_id EXTERNAL_ID","Determine if an instance exists by the instance's EXTERNAL_ID."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def exists_by_external_id(externalid) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		val,instance_id,sgroups=aws.ec2.compute.exists(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],externalid)
-		return val
-	  end
-
-      desc "declare EXTERNAL_ID IMAGE OWNER TYPE ROOT_SIZE ZONE KEY SECURITY_GROUP","Declare a compute instance."
-      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
+      option :imageid, :type => :string, :desc => "filter by owner of the images", :banner => "<imageid>", :aliases => :i, :default => nil
+
+      def view_images
+        @aws.ec2.compute.view_images(options[:region], options[:viewtype], options[:owner], options[:imageid], @out, (options[:verbose] ? @out : nil))
+      end
+
+      desc "exists_by_external_id EXTERNAL_ID", "Determine if an instance exists by the instance's EXTERNAL_ID."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def exists_by_external_id(externalid)
+        val, instance_id, sgroups=@aws.ec2.compute.exists(options[:region], @out, (options[:verbose] ? @out : nil), options[:vpcid], externalid)
+        return val
+      end
+
+      desc "declare EXTERNAL_ID IMAGE OWNER TYPE ROOT_SIZE ZONE KEY SECURITY_GROUP", "Declare a compute instance."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
       option :privateip, :type => :array, :desc => "array of private ip addresses, in vpc, each given a network interface", :banner => "<privateip>", :aliases => :p, :default => nil
       option :optimized, :type => :string, :desc => "ebs optimized", :banner => "<optimized>", :aliases => :i, :default => false
-	  option :apiterminate, :type => :string, :desc => "ebs optimized", :banner => "<apiterminate>", :aliases => :a, :default => false
-      option :clienttoken, :type => :string, :desc => "AWS VPC id", :banner => "<clienttoken>",  :aliases => :c, :default => nil
-      option :nagios, :type => :boolean, :desc => "Returns a nagios check result",  :aliases => :n, :default => false
-	  option :undofile, :type => :string, :desc => "File for undo commands", :banner => "<undofile>", :aliases => :f, :default => nil
+      option :apiterminate, :type => :string, :desc => "ebs optimized", :banner => "<apiterminate>", :aliases => :a, :default => false
+      option :clienttoken, :type => :string, :desc => "AWS VPC id", :banner => "<clienttoken>", :aliases => :c, :default => nil
+      option :check, :type => :boolean, :desc => "Returns a check result", :aliases => :n, :default => false
+      option :undofile, :type => :string, :desc => "File for undo commands", :banner => "<undofile>", :aliases => :f, :default => nil
       option :nosdcheck, :type => :boolean, :desc => "No source dest check (primarily needed for NAT instances)", :banner => "<nosdcheck>", :aliases => :s, :default => false
       option :skipruncheck, :type => :boolean, :desc => "Flag to skip the running check during testing.", :banner => "<skipruncheck>", :aliases => :r, :default => false
-      option :volume, :type => :string, :desc => "volume (ex: --volume /dev/sdf)", :banner => "<volume>", :default => false
-      option :volsize, :type => :string, :desc => "volsize", :banner => "<volsize>", :default => false
-	  def declare(externalid,image,owner,type,root,zone,key,sgroup) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		val=aws.ec2.compute.declare(externalid,image,owner,type,root,zone,key,sgroup,options[:privateip],options[:optimized],options[:apiterminate],options[:clienttoken],options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],options[:nagios],options[:undofile],options[:nosdcheck],options[:skipruncheck],options[:volsize],options[:volume])
-		return val
-	  end
-    
-	  desc "delete EXTERNAL_ID","Delete the instance's an instance by EXTERNAL_ID, this only works if api termination is enabled."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def delete(externalid) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.compute.delete(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],externalid)
-	  end
-
-      desc "exists_security_group_assoc EXTERNAL_ID SECURITY_GROUP","Determine if an instance with an EXTERNAL_ID is associated to a named SECURITY_GROUP."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def exists_security_group_assoc(externalid,security_group) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		val,instancid,sgroupid=aws.ec2.compute.exists_security_group_assoc(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],externalid,security_group)
-	  end
-
-	  desc "assoc_security_group EXTERNAL_ID SECURITY_GROUP","Associate a named SECURITY_GROUP to an instance by the instance's EXTERNAL_ID."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def assoc_security_group(externalid,security_group) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.compute.assoc_security_group(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],externalid,security_group)
-	  end
-
-      desc "exists_secondary_ip EXTERNAL_ID IP","Determine if a secondary IP exists by the instance's EXTERNAL_ID."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def exists_secondary_ip(externalid,ip) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		val,compute_exists,netid=aws.ec2.compute.exists_secondary_ip(options[:region],ip,$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],externalid)
-	  end
-
-	  desc "declare_secondary_ip EXTERNAL_ID IP","Declare secondary IP for instance by the instance's EXTERNAL_ID."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-      option :nagios, :type => :boolean, :desc => "Returns a nagios check result",  :aliases => :n, :default => false
-	  option :undofile, :type => :string, :desc => "File for undo commands", :banner => "<undofile>", :aliases => :f, :default => nil
-	  def declare_secondary_ip(externalid,ip) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.compute.declare_secondary_ip(options[:region],ip,$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],externalid,options[:nagios],options[:undofile])
-	  end
-
-	  desc "delete_secondary_ip EXTERNAL_ID IP","Delete secondary IP for instance by the instance's EXTERNAL_ID."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def delete_secondary_ip(externalid,ip) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.compute.delete_secondary_ip(options[:region],ip,$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],externalid)
-	  end
-
-	end
+      option :volume, :type => :string, :desc => "volume (ex: --volume /dev/sdf)", :banner => "<volume>"
+      option :volsize, :type => :string, :desc => "volsize", :banner => "<volsize>"
+      option :tenancy, :type => :string, :desc => "tenancy can be defualt|dedicated", :banner => "<tenancy>" #AWS defaults to "default" when not specified
+      option :profilename, :type => :string, :desc => "instance profile name", :banner => "<profilename>"
+      option :userdata, :type => :string, :desc => "instance userdata yml filename", :banner => "<userdata>"
+      def declare(externalid, image, owner, type, root, zone, key, sgroup)
+        val=@aws.ec2.compute.declare(externalid, image, owner, type, root, zone, key, sgroup, options[:privateip], options[:optimized], options[:apiterminate], options[:clienttoken], options[:region], @out, (options[:verbose] ? @out : nil), options[:vpcid], options[:check], options[:undofile], options[:nosdcheck], options[:skipruncheck], options[:volsize], options[:volume], options[:tenancy], options[:profilename], options[:userdata])
+        return val
+      end
+
+      desc "delete EXTERNAL_ID", "Delete the instance's an instance by EXTERNAL_ID, this only works if api termination is enabled."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def delete(externalid)
+        @aws.ec2.compute.delete(options[:region], @out, (options[:verbose] ? @out : nil), options[:vpcid], externalid)
+      end
+
+      desc "exists_security_group_assoc EXTERNAL_ID SECURITY_GROUP", "Determine if an instance with an EXTERNAL_ID is associated to a named SECURITY_GROUP."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def exists_security_group_assoc(externalid, security_group)
+        val, instancid, sgroupid=@aws.ec2.compute.exists_security_group_assoc(options[:region], @out, (options[:verbose] ? @out : nil), options[:vpcid], externalid, security_group)
+      end
+
+      desc "assoc_security_group EXTERNAL_ID SECURITY_GROUP", "Associate a named SECURITY_GROUP to an instance by the instance's EXTERNAL_ID."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def assoc_security_group(externalid, security_group)
+        @aws.ec2.compute.assoc_security_group(options[:region], @out, (options[:verbose] ? @out : nil), options[:vpcid], externalid, security_group)
+      end
+
+      desc "exists_secondary_ip EXTERNAL_ID IP", "Determine if a secondary IP exists by the instance's EXTERNAL_ID."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def exists_secondary_ip(externalid, ip)
+        val, compute_exists, netid=@aws.ec2.compute.exists_secondary_ip(options[:region], ip, @out, (options[:verbose] ? @out : nil), options[:vpcid], externalid)
+      end
+
+      desc "declare_secondary_ip EXTERNAL_ID IP", "Declare secondary IP for instance by the instance's EXTERNAL_ID."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+      option :check, :type => :boolean, :desc => "Returns a check result", :aliases => :n, :default => false
+      option :undofile, :type => :string, :desc => "File for undo commands", :banner => "<undofile>", :aliases => :f, :default => nil
+
+      def declare_secondary_ip(externalid, ip)
+        @aws.ec2.compute.declare_secondary_ip(options[:region], ip, @out, (options[:verbose] ? @out : nil), options[:vpcid], externalid, options[:check], options[:undofile])
+      end
+
+      desc "delete_secondary_ip EXTERNAL_ID IP", "Delete secondary IP for instance by the instance's EXTERNAL_ID."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def delete_secondary_ip(externalid, ip)
+        @aws.ec2.compute.delete_secondary_ip(options[:region], ip, @out, (options[:verbose] ? @out : nil), options[:vpcid], externalid)
+      end
+
+      desc "interval_eligible", "present a list of instances by name eligible for start stop"
+      option :policy_arn, :type => :string, :desc => "Policy Arn", :banner => "<policy>", :default => nil
+
+      def interval_eligible
+        @aws.ec2.compute.interval_eligible(options[:policy_arn], options[:region], @out, (options[:verbose] ? @out : nil))
+      end
+
+      desc "set_interval HOURS EMAIL", ""
+      option :name, :type => :string, :desc => "Name", :banner => "<role>", :default => nil
+      option :externalid, :type => :string, :desc => "Externalid", :banner => "<policy>", :default => nil
+      option :overridebasetime, :type => :string, :desc => "Override basetime for testing, it will be used instead of now", :banner => "<overridebasetime>", :default => nil
+      option :policy_arn, :type => :string, :desc => "Policy Arn", :banner => "<policy>", :default => nil
+
+      def set_interval(hours, email)
+        @aws.ec2.compute.set_interval(options[:policy_arn], options[:name], options[:externalid], hours, email, options[:region], @out, (options[:verbose] ? @out : nil), options[:overridebasetime])
+      end
+
+      desc "interval_cron POLICY_ARN", "This job will search through the hosts and stop and start hosts accourding to their interval tag setting"
+      option :policy_arn, :type => :string, :desc => "Policy Arn", :banner => "<policy>", :default => nil
+      option :overridebasetime, :type => :string, :desc => "Override basetime for testing, it will be used instead of now", :banner => "<overridebasetime>", :default => nil
+
+      def interval_cron()
+        @aws.ec2.compute.interval_cron(options[:policy_arn], options[:region], @out, (options[:verbose] ? @out : nil), options[:overridebasetime])
+      end
+
+      desc "start", "start instance specified"
+      option :name, :type => :string, :desc => "Name", :banner => "<role>", :default => nil
+      option :externalid, :type => :string, :desc => "Externalid", :banner => "<policy>", :default => nil
+      option :skipruncheck, :type => :boolean, :desc => "Flag to skip the running check during testing.", :banner => "<skipruncheck>", :aliases => :r, :default => false
+
+      def start()
+        @aws.ec2.compute.start(options[:name], options[:externalid], options[:region], @out, (options[:verbose] ? @out : nil), options[:skipruncheck])
+      end
+
+      desc "stop", "stop instance specified"
+      option :name, :type => :string, :desc => "Name", :banner => "<role>", :default => nil
+      option :externalid, :type => :string, :desc => "Externalid", :banner => "<policy>", :default => nil
+      option :skipruncheck, :type => :boolean, :desc => "Flag to skip the running check during testing.", :banner => "<skipruncheck>", :aliases => :r, :default => false
+
+      def stop()
+        @aws.ec2.compute.stop(options[:name], options[:externalid], options[:region], @out, (options[:verbose] ? @out : nil), options[:skipruncheck])
+      end
+
+    end
   end
 end