gclouder 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95511ff6f5ee4864378cc09528959d8ae5ec2e89
-  data.tar.gz: 81bc37875b4769332229a8f13b8012ded6855abc
+  metadata.gz: 6ac083baef10e03cd7b8511ef19f0aefe57d2443
+  data.tar.gz: 5c9c516ddb5ed7f8646d5871849caae3b7b9bf7f
 SHA512:
-  metadata.gz: 13a5525977076e2cdb762d48c56e43ea6144cec5a25c40160ddaa56db6c7c0a290b7859a506551860fae107592c05263a0027842e2065559b39576e971515ad5
-  data.tar.gz: 5645532cee099f4100ccafda530ae73cf77bad9dd18778bcf7baef7b507c8d26e8a67817cb56ef0a8f286b67eef2c679629babeeac13a35df5ae336e1a3251a3
+  metadata.gz: b20abe4ff1eb7f87958976b444362e6bcc90049320e3bbfbaa65f68250da729eb7537f9879d6d476d74db7011f3a4dbcee0c8328a8097873172f8f994377d4e9
+  data.tar.gz: 10eb08892b53ae3083b3f6ff295550864ca449c1a1e9b49f3834360cfa6a05b33c11210758e0f04849d1afaaa0b99c5ce8f1e97ebd216ed82d6c81ec5cb15160

data/lib/gclouder/resource.rb

@@ -12,9 +12,15 @@ module GClouder
     end
 
     def self.resource?(resource, name, args = nil, filter_key: "name", filter_value: nil, filter: "#{filter_key} ~ ^#{filter_value || name}$", project_id: nil, silent: false, extra_info: nil, indent: 3)
+
+      p "filter: #{filter}"
+      p "filter_key: #{filter_key}"
+      p "filter_value: #{filter_value}"
       exists = \
         gcloud("#{resource} list --filter '#{filter}' #{args} | jq '. | length'", force: true, project_id: project_id) > 0
 
+      puts "exists: #{exists}"
+
       # if silent is specified then shell call returns boolean, otherwise integer
       if exists.is_a?(Integer)
         exists = exists > 0 ? true : false
@@ -33,14 +39,14 @@ module GClouder
       gcloud "#{resource} describe #{name} #{args}", force: force, failure: failure, silent: silent, project_id: project_id
     end
 
-    def self.ensure(resource, name, args = nil, project_id: nil, extra_info: nil, silent: false, indent: 3, filter_key: "name", filter: nil)
-      return if resource?(resource, name, project_id: project_id, extra_info: extra_info, silent: silent, indent: indent, filter_key: filter_key, filter: filter)
+    def self.ensure(resource, name, args = nil, project_id: nil, extra_info: nil, silent: false, indent: 3, filter_key: "name", filter_value: nil, filter: "#{filter_key} ~ ^#{filter_value || name}$")
+      return if resource?(resource, name, project_id: project_id, extra_info: extra_info, silent: silent, indent: indent, filter_key: "name", filter_value: nil, filter: "#{filter_key} ~ ^#{filter_value || name}$")
       feedback("add", resource, name, extra_info: extra_info, indent: indent, silent: silent)
       gcloud "#{resource} create #{name} #{args}", project_id: project_id, silent: silent
     end
 
-    def self.purge(resource, name, args = nil, project_id: nil, silent: false, indent: 3, filter: nil)
-      return unless resource?(resource, name, project_id: project_id, silent: true, indent: indent, filter: filter)
+    def self.purge(resource, name, args = nil, project_id: nil, silent: false, indent: 3, filter_key: "name", filter_value: nil, filter: "#{filter_key} ~ ^#{filter_value || name}$")
+      return unless resource?(resource, name, project_id: project_id, silent: true, indent: indent, filter_key: "name", filter_value: nil, filter: "#{filter_key} ~ ^#{filter_value || name}$")
       extra_info = "[skipped] (--purge not specified)" unless cli_args[:purge]
       feedback("remove", resource, name, extra_info: extra_info, indent: indent, silent: silent)
       gcloud "#{resource} delete #{name} #{args}", project_id: project_id if cli_args[:purge]

data/lib/gclouder/resources/container/node_pools.rb

@@ -131,7 +131,7 @@ module GClouder
             zone = pool["zone"]
 
             if !check_exists?(cluster["name"], pool["name"], zone)
-              gcloud("alpha container node-pools create --cluster #{cluster["name"]} #{parameters} #{pool["name"]}")
+              gcloud("container node-pools create --cluster #{cluster["name"]} #{parameters} #{pool["name"]}")
               if cli_args[:dry_run]
                 add pool["name"], indent: 4
               else

data/lib/gclouder/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gclouder
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Rob Wilson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop