terraform_inventory 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6513c4476079efcac4b5b632fbc8513e1a9f9a22
-  data.tar.gz: 93610af144d41bd561652739891d96867fc07561
+  metadata.gz: 3acbc15219138ae1e49064e2474e45835aad33a9
+  data.tar.gz: 9f6be89b90e0d44030f82564c1a32484e0b07ecb
 SHA512:
-  metadata.gz: cf5ba2d455565aedb88d44c51f025f3d6ecc1145cb94e3d34337fa06ce3902f24bbf8cb5b401add741597a19fde243ea725d8e9b8ea1f0a625adc51669d8eba1
-  data.tar.gz: b9384ef22c9c57ddac87c8c7f9e0a15e76d4f43b66220c1a92466cb2366e221d5b023d2c2ade4d71e4b55191259b985fb20b7284fd84a30bb2789187b40b0b34
+  metadata.gz: 32163d05d1148ff67465f3380931e0b10ec82f6a31d6f3cb6d3be01e8bba3f4ca3227ce9235639ac4efd7cadc24ed9902982a359e7614bd37e5e0352fdd6a886
+  data.tar.gz: 4b1b32037fd2c7d54d58d446ddba6e53438b4c512598a64b57bf2f24a3ea3d9cfdd95d9695c1ff924f48d1882ba8fffab526d6872df1ea4ee3941290be8478a3

data/lib/terraform_inventory/terraform_state.rb

@@ -3,7 +3,7 @@ require "terraform_inventory/exception"
 
 module TerraformInventory
   class TerraformState
-    # Find a resource given a resource selector.
+    # Find resources given a resource selector.
     #
     # A resource selector is composed of the following:
     #   resource_type (ex. aws_instance)
@@ -14,10 +14,15 @@ module TerraformInventory
     #   aws_instance.web.1  -  selects a specific aws_instance resource named web
     #   aws_instance.web    -  selects all aws_instance resources named web
     #
-    def find_resource(resource_selector)
+    # Returns:
+    #   [ resource_data ]
+    #
+    def find_resources(resource_selector)
       resource_type, resource_name, resource_number = parse_resource_selector(resource_selector)
 
-      if resource_number
+      if @state[resource_type][resource_name].nil?
+        []
+      elsif resource_number
         [@state[resource_type][resource_name][resource_number]]
       else
         @state[resource_type][resource_name]
@@ -27,8 +32,13 @@ module TerraformInventory
     def group_by_host(resource_host_group_mapping)
       resource_host_group_mapping.reduce({}) do |data, (resource_selector, host_group)| # rubocop:disable Style/EachWithObject
         data[host_group.to_sym] ||= []
-        data[host_group.to_sym].concat find_resource(resource_selector)
+        resources = find_resources(resource_selector)
+
+        if resources.nil? || resources.empty? || resources.first.nil?
+          raise "Resources matching resource_selector '#{resource_selector}' not found."
+        end
 
+        data[host_group.to_sym].concat resources
         data
       end
     end

data/lib/terraform_inventory/version.rb

@@ -1,3 +1,3 @@
 module TerraformInventory
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/terraform_inventory/terraform_state_spec.rb

@@ -49,7 +49,7 @@ describe TerraformInventory::TerraformState do
 
   describe "#find_resource" do
     context "using a resource_selector without resource_number" do
-      let(:resources) { state.find_resource("aws_instance.web") }
+      let(:resources) { state.find_resources("aws_instance.web") }
 
       it "returns the correct resources" do
         expect(resources.size).to eq(2)
@@ -59,23 +59,45 @@ describe TerraformInventory::TerraformState do
     end
 
     context "using a resource_selector with a resource_number" do
-      let(:resources) { state.find_resource("aws_instance.web.1") }
+      let(:resources) { state.find_resources("aws_instance.web.1") }
 
       it "returns the correct resources" do
         expect(resources.size).to eq(1)
         expect(resources.first["id"]).to eq("i-b69b2b9a")
       end
     end
+
+    context "using a resource_selector that won't be found" do
+      let(:resources) { state.find_resources("aws_instance.freeswitch") }
+
+      it "returns an empty array" do
+        expect(resources.size).to eq(0)
+      end
+    end
   end
 
   describe "#group_by_host" do
-    let(:groups) { state.group_by_host Hash["aws_instance.web", "web"] }
+    context "when a resource_selector is found" do
+      let(:groups) { state.group_by_host Hash["aws_instance.web", "web"] }
 
-    it "properly groups resources" do
-      expect(groups.keys.size).to eq(1)
-      expect(groups.keys.first).to eq(:web)
-      expect(groups[:web].first["id"]).to eq("i-1299293e")
-      expect(groups[:web][1]["id"]).to eq("i-b69b2b9a")
+      it "properly groups resources" do
+        expect(groups.keys.size).to eq(1)
+        expect(groups.keys.first).to eq(:web)
+        expect(groups[:web].first["id"]).to eq("i-1299293e")
+        expect(groups[:web][1]["id"]).to eq("i-b69b2b9a")
+      end
+    end
+
+    context "when a resource_selector isn't found" do
+      it "throws an exception" do
+        begin
+          state.group_by_host Hash["aws_instance.freeswitch", "freeswitch"]
+        rescue
+          next
+        else
+          raise "This should have raised an exception"
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraform_inventory
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tyler Cross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor