gclouder 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b301187b82d56498d5048872bad4c43f2839e99b
-  data.tar.gz: bba5bbd845a223e04a1ca27c21d6b3e6d140698c
+  metadata.gz: 5c73e111c08a0c24e449a66300c9115b0192d9a6
+  data.tar.gz: 5635bd82f72b7cc8415e0e6dd740574daa9d5a55
 SHA512:
-  metadata.gz: '008c6fd979952e93abaa91b78b9f0a371c1d05f387e6051c205a57b70d5bb01f5d1c82ac8ea9b2201f97ca1282b7c6ee45faadd16b1343c7b464a23b53c57fa3'
-  data.tar.gz: e32791cce0fc36efec4076d4160cb90502c741b2fd0d1a23ac179a5334c9365bd00015588e4506291ad387cd027b5f8c3515e87cc91940363d57314381006b18
+  metadata.gz: f73700e41355989d96ed631482d3ed5fb53b45f5212101dcfadbe4622cc6bad923dfe3e81621d852a9bf9e9f635229e9d736ce1cc6df6a911a7238dcd4a8288c
+  data.tar.gz: 1b936d25971460cdccd18fa8310e644cf9391b083b06799e181df43437d60c615f219a2de5c2ad95b638076f783d9be1585b2d2f94e27898a4a7dc79b1285fbc

data/lib/gclouder/resources/storage/notifications.rb

@@ -40,7 +40,7 @@ module GClouder
             # We also don't support every key that gsutil does. See Notification.ensure() below.
             permitted_and_required_keys = {
               "bucket"=>{"type"=>"String", "required"=>true},
-              "topic"=>{"type"=>"String", "required"=>true},
+              "project"=>{"type"=>"String", "required"=>true},
               "events"=>{"type"=>"Array", "required"=>false},
               "prefix"=>{"type"=>"String", "required"=>false}
             }
@@ -67,13 +67,13 @@ module GClouder
             end
 
             return gsutil("notification list", "gs://#{notification["bucket"]}", force: true)
-              .include?("projects/#{project["project_id"]}/topics/#{notification["topic"]}")
+              .include?("projects/#{notification["project"]}/topics/#{notification["name"]}")
 
           end
 
           def self.ensure(notification)
             if notification_exists?(notification)
-              good "notification topic: #{notification["name"]}; bucket: #{notification["bucket"]}", indent: 4
+              good "notification topic: projects/#{notification["project"]}/topics/#{notification["name"]}; bucket: #{notification["bucket"]}", indent: 4
               return
             end
 
@@ -86,7 +86,7 @@ module GClouder
               prefix_arg = "-p #{notification["prefix"]}"
             end
 
-            args = "-t #{notification["name"]} #{prefix_arg} #{event_type_args} -f json gs://#{notification["bucket"]}"
+            args = "-t projects/#{notification["project"]}/topics/#{notification["name"]} #{prefix_arg} #{event_type_args} -f json gs://#{notification["bucket"]}"
 
             add "notification topic: #{notification["name"]}; bucket: #{notification["bucket"]}", indent: 4
             gsutil "notification create", args

data/lib/gclouder/version.rb

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

metadata

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