Skip to content
This repository was archived by the owner on Aug 7, 2020. It is now read-only.

Must merge this PR in to run the audit command correctly #28

Merged
merged 5 commits into from
Dec 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/sport_ngin_aws_auditor/instance_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def add_region_ris_to_hash(ris_region, differences)
def add_additional_instances_to_hash(instances_to_add, instance_hash, extra_string)
instances_to_add.each do |instance|
next if instance.nil?
key = instance.to_s.dup << extra_string << instance.name << ")"
key = instance.to_s.dup << extra_string << (instance.name || "") << ")"
instance_result = {}

if instance_hash.has_key?(instance.to_s) && instance_hash[instance.to_s][:count] > 0
Expand Down
13 changes: 8 additions & 5 deletions lib/sport_ngin_aws_auditor/scripts/audit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,19 @@ def self.execute(environment, options=nil, global_options=nil)
tag_name = options[:tag]
end

ignore_instances_patterns = options[:ignore_instances_patterns].split(', ') if options[:ignore_instances_patterns]
ignore_instances_regexes = []
ignore_instances_patterns.each do |r|
ignore_instances_regexes << Regexp.new(r)
if options[:ignore_instances_patterns]
ignore_instances_patterns = options[:ignore_instances_patterns].split(', ')
ignore_instances_patterns.each do |r|
ignore_instances_regexes << Regexp.new(r)
end
end

zone_output = options[:zone_output]

cycle = [["EC2Instance", options[:ec2]],
["RDSInstance", options[:rds]],
["CacheInstance", options[:cache]]]
["RDSInstance", options[:rds]],
["CacheInstance", options[:cache]]]

if !slack
print "Gathering info, please wait..."; print "\r"
Expand Down