zaws 0.0.5 → 0.1.1

data/lib/zaws/command/security_group.rb

@@ -2,91 +2,104 @@ require 'thor'
 
 module ZAWS
   module Command
-	class Security_Group < 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 security groups."
-	  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.security_group.view(options[:region],options[:viewtype],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid])
-	  end
-
-	  desc "exists_by_name GROUP_NAME","Determine if a security group exists by name GROUP_NAME."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def exists_by_name(group_name) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.security_group.exists(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],group_name)
-	  end
-
-	  desc "declare GROUP_NAME DESCRIPTION","Declare a new security group GROUP_NAME, but skip creating it if it exists."
-	  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(group_name,description) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		exitcode = aws.ec2.security_group.declare(options[:region],options[:vpcid],group_name,description,options[:nagios],$stdout,(options[:verbose]?$stdout:nil),options[:undofile])
+    class Security_Group < 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)
+        @aws = ZAWS::AWS.new(shellout, awscli)
+        @out = $stdout
+        @print_exit_code = false
+      end
+
+      desc "view", "View security groups."
+      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 :unused, :desc => "Get all security groups unused by instances", :type => :boolean, :aliases => :u, :default => false
+
+      def view
+        @out.puts(@aws.ec2.security_group.view(options[:region], (options[:unused] ? 'json' : options[:viewtype]),  (options[:verbose] ? @out : nil), options[:vpcid], nil, nil, nil, nil, nil, nil, options[:unused]))
+      end
+
+      desc "exists_by_name GROUP_NAME", "Determine if a security group exists by name GROUP_NAME."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+      def exists_by_name(group_name)
+        val,sgroupid=@aws.ec2.security_group.exists(options[:region], (options[:verbose] ? @out : nil), options[:vpcid], group_name)
+        @out.puts(val.to_s)
+      end
+
+      desc "declare GROUP_NAME DESCRIPTION", "Declare a new security group GROUP_NAME, but skip creating it if it exists."
+      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(group_name, description)
+        exitcode = @aws.ec2.security_group.declare(options[:region], options[:vpcid], group_name, description, options[:check], @out, (options[:verbose] ? @out : nil), options[:undofile])
         exit exitcode
-	  end
-
-	  desc "delete GROUP_NAME","Delete a new security group GROUP_NAME, but skip it if it does not exist."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def delete(group_name) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.security_group.delete(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],group_name)
-	  end
-
-	  desc "ingress_group_exists TARGET_GROUP_NAME SOURCE_GROUP_NAME PROTOCOL PORT","Determine if an ingress security group rule exists."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def ingress_group_exists(target,source,protocol,port) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.security_group.ingress_group_exists(options[:region],options[:vpcid],target,source,protocol,port,$stdout,(options[:verbose]?$stdout:nil))
-	  end
-
-	  desc "ingress_cidr_exists TARGET_GROUP_NAME CIDR PROTOCOL PORT","Determine if an ingress CIDR rule exists."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def ingress_cidr_exists(target,cidr,protocol,port) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.security_group.ingress_cidr_exists(options[:region],options[:vpcid],target,cidr,protocol,port,$stdout,(options[:verbose]?$stdout:nil))
-	  end
-
-	  desc "declare_ingress_group TARGET_GROUP_NAME SOURCE_GROUP_NAME PROTOCOL PORT","Declare an ingress security group rule."
-	  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
+      end
+
+      desc "delete GROUP_NAME", "Delete a new security group GROUP_NAME, but skip it if it does not exist."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+      def delete(group_name)
+        @out.puts(@aws.ec2.security_group.delete(options[:region],(options[:verbose] ? @out : nil), options[:vpcid], group_name))
+      end
+
+      desc "ingress_group_exists TARGET_GROUP_NAME SOURCE_GROUP_NAME PROTOCOL PORT", "Determine if an ingress security group rule exists."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def ingress_group_exists(target, source, protocol, port)
+        @aws.ec2.security_group.ingress_group_exists(options[:region], options[:vpcid], target, source, protocol, port, @out, (options[:verbose] ? @out : nil))
+      end
+
+      desc "ingress_cidr_exists TARGET_GROUP_NAME CIDR PROTOCOL PORT", "Determine if an ingress CIDR rule exists."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def ingress_cidr_exists(target, cidr, protocol, port)
+        @aws.ec2.security_group.ingress_cidr_exists(options[:region], options[:vpcid], target, cidr, protocol, port, @out, (options[:verbose] ? @out : nil))
+      end
+
+      desc "declare_ingress_group TARGET_GROUP_NAME SOURCE_GROUP_NAME PROTOCOL PORT", "Declare an ingress security group rule."
+      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_ingress_group(target,source,protocol,port) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		exitcode = aws.ec2.security_group.declare_ingress_group(options[:region],options[:vpcid],target,source,protocol,port,options[:nagios],$stdout,(options[:verbose]?$stdout:nil),options[:undofile])
-		exit exitcode
-	  end
-
-	  desc "declare_ingress_cidr TARGET_GROUP_NAME CIDR PROTOCOL PORT","Declare an ingress CIDR rule."
-	  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
+
+      def declare_ingress_group(target, source, protocol, port)
+        exitcode = @aws.ec2.security_group.declare_ingress_group(options[:region], options[:vpcid], target, source, protocol, port, options[:check], @out, (options[:verbose] ? @out : nil), options[:undofile])
+        exit exitcode
+      end
+
+      desc "declare_ingress_cidr TARGET_GROUP_NAME CIDR PROTOCOL PORT", "Declare an ingress CIDR rule."
+      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_ingress_cidr(target,cidr,protocol,port) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		exitcode = aws.ec2.security_group.declare_ingress_cidr(options[:region],options[:vpcid],target,cidr,protocol,port,options[:nagios],$stdout,(options[:verbose]?$stdout:nil),options[:undofile])
-		exit exitcode
-	  end
-
-	  desc "delete_ingress_group TARGET_GROUP_NAME SOURCE_GROUP_NAME PROTOCOL PORT","Delete an ingress security group rule."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def delete_ingress_group(target,source,protocol,port) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.security_group.delete_ingress_group(options[:region],options[:vpcid],target,source,protocol,port,$stdout,(options[:verbose]?$stdout:nil))
-	  end
-
-	  desc "delete_ingress_cidr TARGET_GROUP_NAME CIDR PROTOCOL PORT","Delete an ingress security cidr rule."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
-	  def delete_ingress_cidr(target,cidr,protocol,port) 
-		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.security_group.delete_ingress_cidr(options[:region],options[:vpcid],target,cidr,protocol,port,$stdout,(options[:verbose]?$stdout:nil))
-	  end
-
-	end
+
+      def declare_ingress_cidr(target, cidr, protocol, port)
+        exitcode = @aws.ec2.security_group.declare_ingress_cidr(options[:region], options[:vpcid], target, cidr, protocol, port, options[:check], @out, (options[:verbose] ? @out : nil), options[:undofile])
+        exit exitcode
+      end
+
+      desc "delete_ingress_group TARGET_GROUP_NAME SOURCE_GROUP_NAME PROTOCOL PORT", "Delete an ingress security group rule."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def delete_ingress_group(target, source, protocol, port)
+        @aws.ec2.security_group.delete_ingress_group(options[:region], options[:vpcid], target, source, protocol, port, @out, (options[:verbose] ? @out : nil))
+      end
+
+      desc "delete_ingress_cidr TARGET_GROUP_NAME CIDR PROTOCOL PORT", "Delete an ingress security cidr rule."
+      option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>", :aliases => :v, :default => nil
+
+      def delete_ingress_cidr(target, cidr, protocol, port)
+        @aws.ec2.security_group.delete_ingress_cidr(options[:region], options[:vpcid], target, cidr, protocol, port, @out, (options[:verbose] ? @out : nil))
+      end
+
+    end
   end
 end
 

data/lib/zaws/command/subnet.rb

@@ -2,52 +2,64 @@ require 'thor'
 
 module ZAWS
   module Command
-	class Subnet < 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 subnets."
-	  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.subnet.view(options[:region],options[:viewtype],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid])
-	  end
-
-	  desc "id_by_ip PRIVATE_IP VPCID","get subnet id by specifying PRIVATE_IP address in subnet"
-	  def id_by_ip(privateip,vpcid)
-        aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-	    aws.ec2.subnet.id_by_ip(options[:region],$stdout,(options[:verbose]?$stdout:nil),vpcid,privateip)
-	  end
-
-	  desc "id_by_cidrblock CIDRBLOCK VPCID","get subnet id by specifying CIDRBLOCK for subnet"
-	  def id_by_cidrblock(cidrblock,vpcid)
-        aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.subnet.id_by_cidrblock(options[:region],$stdout,(options[:verbose]?$stdout:nil),vpcid,cidrblock)
-	  end
-
-	  desc "exists CIDRBLOCK VPCID","Determine if a subnet exists by CIDRBLOCK."
-	  def exists(cidrblock,vpcid) 
-        aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.subnet.exists(options[:region],$stdout,(options[:verbose]?$stdout:nil),vpcid,cidrblock)
-	  end
-
-	  desc "declare CIDRBLOCK AVAILABILITY_ZONE VPCID","Create a subnet if it does not exist already"
-      option :availabilitytimeout, :type => :numeric, :desc => "AWS availability zone (eg us-west-1,us-west-2,...)", :banner => "<azone>",  :aliases => :t, :default => 30
-      option :nagios, :type => :boolean, :desc => "Returns a nagios check result",  :aliases => :n, :default => false
+    class Subnet < 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 subnets."
+      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
+        @out.puts(@aws.ec2.subnet.view(options[:region], options[:viewtype], (options[:verbose] ? @out : nil), options[:vpcid]))
+      end
+
+      desc "id_by_ip PRIVATE_IP VPCID", "get subnet id by specifying PRIVATE_IP address in subnet"
+
+      def id_by_ip(privateip, vpcid)
+        @aws.ec2.subnet.id_by_ip(options[:region], @out, (options[:verbose] ? @out : nil), vpcid, privateip)
+      end
+
+      desc "id_by_cidrblock CIDRBLOCK VPCID", "get subnet id by specifying CIDRBLOCK for subnet"
+
+      def id_by_cidrblock(cidrblock, vpcid)
+        @aws.ec2.subnet.id_by_cidrblock(options[:region], @out, (options[:verbose] ? @out : nil), vpcid, cidrblock)
+      end
+
+      desc "exists CIDRBLOCK VPCID", "Determine if a subnet exists by CIDRBLOCK."
+
+      def exists(cidrblock, vpcid)
+        @out.puts(@aws.ec2.subnet.exists(options[:region], (options[:verbose] ? @out : nil), vpcid, cidrblock).to_s)
+      end
+
+      desc "declare CIDRBLOCK AVAILABILITY_ZONE VPCID", "Create a subnet if it does not exist already"
+      option :availabilitytimeout, :type => :numeric, :desc => "Timeout before exiting from waiting for state to change from pending to available.", :banner => "<azone>", :aliases => :t, :default => 30
+      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(cidrblock,availabilityzone,vpcid)
-        aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		exitcode=aws.ec2.subnet.declare(options[:region],vpcid,cidrblock,availabilityzone,options[:availabilitytimeout],$stdout,(options[:verbose]?$stdout:nil),options[:nagios],options[:undofile])
-		exit exitcode
-	  end
-
-	  desc "delete CIDRBLOCK VPCID","Delete a subnet if it exists."
-	  def delete(cidrblock,vpcid)
-        aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.subnet.delete(options[:region],$stdout,(options[:verbose]?$stdout:nil),vpcid,cidrblock)
-	  end
-	
-	end
+      def declare(cidrblock, availabilityzone, vpcid)
+        exitcode=@aws.ec2.subnet.declare(options[:region], vpcid, cidrblock, availabilityzone, options[:availabilitytimeout], @out, (options[:verbose] ? @out : nil), options[:check], options[:undofile])
+        exit exitcode if not @print_exit_code
+        @out.puts(exitcode)
+      end
+
+      desc "delete CIDRBLOCK VPCID", "Delete a subnet if it exists."
+
+      def delete(cidrblock, vpcid)
+        @aws.ec2.subnet.delete(options[:region], @out, (options[:verbose] ? @out : nil), vpcid, cidrblock)
+      end
+
+    end
   end
 end

data/lib/zaws/command/sumo.rb

@@ -0,0 +1,34 @@
+require 'thor'
+
+module ZAWS
+  module Command
+    class Sumo < Thor
+      class_option :verbose, :type => :boolean, :desc => "Verbose outout", :aliases => :d, :default => false
+
+      attr_accessor :sumo
+      attr_accessor :out
+      attr_accessor :print_exit_code
+
+      def initialize(*args)
+        super
+        shellout=ZAWS::Helper::Shell.new
+        sumoapi = ZAWS::Sumoapi.new(shellout)
+        @sumo = ZAWS::Controllers::Sumo.new(shellout, sumoapi)
+        @out = $stdout
+        @print_exit_code = false
+      end
+
+      desc "view_collectors", "View Collectors."
+      option :home, :type => :string, :default => ENV['HOME'], :desc => 'Home directory location for credentials file'
+      def view_collectors
+        @sumo.view(options[:home], @out, (options[:verbose] ? @out : nil))
+      end
+
+      desc "view_sources", "View Sources."
+      def view_sources(collector_name)
+        @out.puts(@sumo.view_sources(collector_name,options[:home], options[:verbose]))
+      end
+    end
+  end
+end
+

data/lib/zaws/command/vpc.rb

@@ -0,0 +1,53 @@
+require 'thor'
+
+module ZAWS
+  module Command
+    class Vpc < Thor
+      class_option :region, :type => :string, :desc => "AWS Region", :banner => "<region>", :aliases => :r, :required => true, :default => "us-east-1"
+      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"
+      def view
+        @aws.ec2.vpc.view(options[:region], options[:viewtype], @out, (options[:verbose] ? @out : nil))
+      end
+
+      desc "check_management_data", "View data used to manage the vpc."
+      option :profile, :type => :string, :desc => "AWS profile to use.", :banner => "<profile>", :aliases => :w, :default => nil
+      def check_management_data
+        @aws.ec2.vpc.check_management_data(options[:region],  @out, (options[:verbose] ? @out : nil), options[:profile])
+      end
+
+      desc "declare CIDR EXTERNALID", "Declare a new vpc with a name and CIDR."
+      option :availabilitytimeout, :type => :numeric, :desc => "Timeout before exiting from waiting for state to change from pending to available.", :banner => "<azone>", :aliases => :t, :default => 30
+      option :profile, :type => :string, :desc => "AWS profile to use.", :banner => "<profile>", :aliases => :w, :default => nil
+      def declare(cidr,externalid)
+        exitcode= @aws.ec2.vpc.declare(options[:region],cidr, externalid,options[:availabilitytimeout], @out, (options[:verbose] ? @out : nil), options[:profile])
+        exit exitcode unless @print_exit_code
+		    @out.puts(exitcode)
+      end
+
+      desc "view_peering", "View peering connections between vpcs."
+      option :viewtype, :type => :string, :desc => "View type, json or table", :banner => "<viewtype>", :aliases => :w, :default => "table"
+      def view_peering
+        @aws.ec2.vpc.view_peering(options[:region], options[:viewtype], @out, (options[:verbose] ? @out : nil))
+      end
+
+    end
+  end
+end
+
+	

data/lib/zaws/external/awscli/awscli.rb

@@ -0,0 +1,65 @@
+require 'fileutils'
+
+module ZAWS
+  class AWSCLI
+  attr_accessor :home
+
+	def initialize(shellout,keep_filestore_empty=false)
+	  @shellout=shellout
+		@keep_filestore_empty=keep_filestore_empty
+	end
+
+  def filestore
+    @filestore ||= ZAWS::Repository::Filestore.new(@keep_filestore_empty)
+		@filestore.timeout = 1800
+		return @filestore if @keep_filestore_empty
+		@home ||= ENV['HOME']
+    @filestore.location="#{@home}/.awsdata"
+		unless File.directory?(@filestore.location)
+			FileUtils.mkdir_p(@filestore.location)
+		end
+    return @filestore
+  end
+
+  def remove_creds
+		if File.directory?("#{@home}/.awsdata")
+			FileUtils.rmtree("#{@home}/.awsdata")
+		end
+	  if File.exist?("#{@home}/.aws/credentials")
+			File.delete("#{@home}/.aws/credentials")
+		end
+	end
+
+	def version 
+	  if ! @version
+		info = @shellout.cli("aws --version",nil)
+		#aws-cli/1.2.13 Python/2.7.5 Linux/3.10.0-123.el7.x86_64
+		version_match = /(?<version>aws-cli\/[1-9\.]*)/.match(info)
+		@version ||= version_match[:version]
+	  end
+  	  return @version
+	end
+
+	def command_ec2
+	  @_command_ec2 ||= (ZAWS::AWSCLI::Commands::EC2.new(@shellout,self))
+	  return @_command_ec2
+    end
+
+	def command_iam 
+	  @_command_iam ||= (ZAWS::AWSCLI::Commands::IAM.new(@shellout,self))
+	  return @_command_iam
+    end
+
+	def data_ec2
+	  @_data_ec2 ||= (ZAWS::AWSCLI::Data::EC2.new(@shellout,self))
+	  return @_data_ec2
+	end
+
+	def data_iam
+	  @_data_iam ||= (ZAWS::AWSCLI::Data::IAM.new(@shellout,self))
+	  return @_data_iam
+	end
+
+  end
+end
+