gclouder 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29116b388c07abbba630ea7457469e940e4c8053
-  data.tar.gz: 8000b318ef323a161dc1da3f4ca9ade2764a386b
+  metadata.gz: c883949702bd5ebf5955dd329f1270ab98029010
+  data.tar.gz: aa2a1d13fb78f58ce04db2e2065a1c54319741c7
 SHA512:
-  metadata.gz: be2079d49483b0d3468865a3dde9c58cfccda9da1456f75d7d81964a9f3260e5ad44efa1745f728627fc3347d2fee83c854dbda91c59d7319598a75f5cdb8347
-  data.tar.gz: 41adda690f93e17af09d8316635609d2e8875da41035ce5bddec1a16de8114879a1aaf6dfd61f32f1b73ab9603f28e06fba12437363c446ac155385df9b7358f
+  metadata.gz: 2587dbcdb61c10507a2bd0613f13cce975752734acce1c72c046148bf2ae1b995ec04a211a32479f3cc02a0f1b485addf665a4096f8387e198ecd0b6442c0167
+  data.tar.gz: e7142be85907d2b90b6875cc08bab66c0169a1bab8c1084ba6caf39ebf3039be09015feb56bbbe14a2a065d3f3230845aaec6ed231353b3bb94ad29442d3ff4f

data/lib/gclouder/resource.rb

@@ -13,13 +13,15 @@ module GClouder
 
     def self.resource?(resource, name, args = nil, filter_key: "name", filter: "#{filter_key} ~ ^#{name}$", project_id: nil, silent: false, extra_info: nil, indent: 3)
       exists = \
-        gcloud("#{resource} list --filter '#{filter}' #{args} | jq '. | length'", force: true, silent: silent, project_id: project_id)
+        gcloud("#{resource} list --filter '#{filter}' #{args} | jq '. | length'", force: true, project_id: project_id) > 0
 
-      # if silent is specified then shell call returns truthy, otherwise integer
-      exists = exists > 0 ? true : false if !silent
+      # if silent is specified then shell call returns boolean, otherwise integer
+      if exists.is_a?(Integer)
+        exists = exists > 0 ? true : false
+      end
 
       if exists
-        feedback("good", resource, name, extra_info: extra_info, indent: indent, silent: silent)
+        feedback("good", resource, name, extra_info: extra_info, indent: indent, silent: silent) unless silent
         return true
       end
 

data/lib/gclouder/resources/dns.rb

@@ -269,8 +269,9 @@ module GClouder
           true
         end
 
+        # FIXME: if a record exists but ttl or ip are different, an update should be performed
         def self.add_record_set(name, value, zone, type, ttl, project_id)
-          if Resource.resource?("dns record-sets", name, "--zone=#{zone}", filter: "name = #{name} AND type = #{type}", project_id: project_id, silent: true)
+          if record_exists?(project_id, zone, name, type)
             good "#{name} IN #{type} #{value} #{ttl}", indent: 4
             return
           end
@@ -280,6 +281,10 @@ module GClouder
           gcloud "dns record-sets transaction add --name=#{name} --zone=#{zone} --type=#{type} --ttl=#{ttl} #{value}", project_id: project_id
         end
 
+        def self.record_exists?(project_id, zone, name, type)
+          Resource.resource?("dns record-sets", name, "--zone=#{zone}", filter: "name = #{name} AND type = #{type}", project_id: project_id, silent: true)
+        end
+
         def self.lookup_ip(name, context)
           args = context == "global" ? "--global" : "--regions #{context}"
           ip = gcloud("compute addresses list #{name} #{args}", force: true)

data/lib/gclouder/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module GClouder
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gclouder
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Rob Wilson