gclouder 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7311a9316efc730260a93a0b835151265579e08
-  data.tar.gz: eda71d3ca4b1001f2ef5bd1e0e7f913f66b7d99c
+  metadata.gz: 2c516273470e35539fa6a910424577e69a14d5aa
+  data.tar.gz: 9b83e1ac431a504b01b6ae00fb1e9651c3def051
 SHA512:
-  metadata.gz: 57f1d9ecd8560d94f2a542deb5c78fc4ece8e435b153ad19980ad1fdc0e267be1c0f081019eb69396600bb21d8dc0d27b0b4c95c6f2f96f89fcd1518a1a80b1c
-  data.tar.gz: 403efac259b7d0036365ea05fd0bba0f22a44d644056eb313a7182a18e5f0e6930e2bfd8232fa2f29cf0d113de73fb898540329e59b16e5d71f0083e343b7dde
+  metadata.gz: 8b2d0b042a9c2bd01d772c3a04626043c3f2cb1eb1a1e1537ef070d6203d1cf4f52ed2409bc872577c2eaebb95d67806f0ffb73c580116673fd16ce5b07b64dc
+  data.tar.gz: 22107c3383753a45030193eb6ce9b9a64f2a7928d0d7ca93cf540aaa7fc0c556a98fd9ffa6c143d4f70f0b587bcd4f235dc73d8f0a967451b24a85887bd0f145

data/assets/arguments/functions.yml

@@ -0,0 +1,30 @@
+---
+name:
+  type: String
+  required: true
+stage_bucket:
+  type: String
+trigger_topic:
+  type: String
+trigger_http:
+  type: Boolean
+local_path:
+  type: String
+source_url:
+  type: String
+source_path:
+  type: String
+source_branch:
+  type: String
+source_tag:
+  type: String
+source_revision:
+  type: String
+memory:
+  type: String
+timeout:
+  type: String
+include_ignored_files:
+  type: String
+entry-point:
+  type: String

data/lib/gclouder/gsutil.rb

@@ -11,7 +11,7 @@ module GClouder
     end
 
     def gsutil(command, args, force: false)
-      info "# gsutil #{command} -p #{project['project_id']} #{args}" if cli_args[:debug]
+      info "# gsutil #{command} #{args}" if cli_args[:debug]
 
       return if cli_args[:dry_run] && !force
 
@@ -19,7 +19,7 @@ module GClouder
     end
 
     def gsutil_exec(command, args)
-      shell("gsutil #{command} -p #{project['project_id']} #{args}")
+      shell("gsutil #{command} #{args}")
     end
   end
 end

data/lib/gclouder/resource.rb

@@ -11,7 +11,7 @@ module GClouder
       send action, "#{name} #{extra_info}", indent: indent
     end
 
-    def self.resource?(resource, name, args = nil, filter_key: "name", filter: "#{filter_key} ~ ^#{name}$", project_id: nil, silent: false, extra_info: nil, indent: 3)
+    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)
       exists = \
         gcloud("#{resource} list --filter '#{filter}' #{args} | jq '. | length'", force: true, project_id: project_id) > 0
 

data/lib/gclouder/resources/functions/function.rb

@@ -0,0 +1,79 @@
+#!/usr/bin/env ruby
+
+module GClouder
+  module Resources
+    module Functions
+      module Function
+        include GClouder::Config::CLIArgs
+        include GClouder::Logging
+        include GClouder::Resource::Cleaner
+        include GClouder::Config::Project
+
+        def self.header(stage = :ensure)
+          info "[#{stage}] functions / function", indent: 1, title: true
+        end
+
+        def self.ensure
+          return if Local.list.empty?
+          header
+
+          Local.list.each do |region, functions|
+            info region, indent: 2, heading: true
+            info
+            functions.each do |function|
+              Function.ensure(region, function)
+            end
+          end
+        end
+
+        def self.validate
+          return if Local.list.empty?
+          header :validate
+          Local.validate
+        end
+
+        module Local
+          include GClouder::Config::CLIArgs
+          include GClouder::Config::Project
+          include GClouder::Logging
+
+          def self.validate
+            Resources::Validate::Region.instances(
+              list,
+              required_keys:  GClouder::Config::Arguments.required(%w(functions)),
+              permitted_keys: GClouder::Config::Arguments.permitted(%w(functions))
+            )
+          end
+
+          def self.list
+            Resources::Region.instances(path: %w(functions))
+          end
+        end
+
+        module Remote
+          def self.list
+            Resources::Remote.instances(
+              path: %w(beta functions)
+            )
+          end
+        end
+
+        module Function
+          include GClouder::GCloud
+
+          def self.ensure(region, function)
+            filter_value = "projects/#{project['project_id']}/locations/#{region}/functions/#{function["name"]}"
+            type = Resource::resource?("beta functions", function["name"], filter_value: filter_value) ? "change" : "add"
+
+            Resource::feedback(type, "beta functions", function["name"])
+            gcloud "beta functions deploy #{function["name"]} #{hash_to_args(function)} --region=#{region}"
+          end
+
+          def self.purge(region, function)
+            Resource.purge :"beta functions", function["name"], "--region=#{region}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module GClouder
         include GClouder::Logging
         include GClouder::Shell
         include GClouder::Resource::Cleaner
+        include GClouder::Config::Project
 
         def self.header(stage = :ensure)
           info "[#{stage}] storage / buckets", title: true, indent: 1
@@ -78,8 +79,7 @@ module GClouder
 
             return if cli_args[:dry_run]
 
-            # Just use shell, as -p flag is not valid for 'defacl ch'.
-            shell("gsutil defacl ch -u #{default_access} gs://#{bucket_name}")
+            gsutil "defacl ch", "-u #{default_access} gs://#{bucket_name}"
           end
 
           def self.check_exists?(region, bucket_name)
@@ -93,8 +93,7 @@ module GClouder
             end
 
             add "#{bucket["name"]} [#{bucket["default_access"]}]"
-            gsutil "mb", "-l #{region} gs://#{bucket["name"]}"
-
+            gsutil "mb", "-p #{project['project_id']} -l #{region} gs://#{bucket["name"]}"
 
             setDefaultAccess bucket["name"], bucket["default_access"] if bucket.key?("default_access")
           end

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

@@ -41,7 +41,8 @@ module GClouder
             permitted_and_required_keys = {
               "bucket"=>{"type"=>"String", "required"=>true},
               "topic"=>{"type"=>"String", "required"=>true},
-              "events"=>{"type"=>"Array", "required"=>false}
+              "events"=>{"type"=>"Array", "required"=>false},
+              "prefix"=>{"type"=>"String", "required"=>false}
             }
 
             Resources::Validate::Region.instances(
@@ -80,8 +81,12 @@ module GClouder
             if notification.has_key?("events")
               event_type_args = "-e #{notification["events"].join(",")}"
             end
+            prefix_arg = ""
+            if notification.has_key?("prefix")
+              prefix_arg = "-p #{notification["prefix"]}"
+            end
 
-            args = "-t #{notification["name"]} #{event_type_args} -f json gs://#{notification["bucket"]}"
+            args = "-t #{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.8"
+  VERSION = "0.1.9"
 end

data/lib/gclouder.rb

@@ -80,6 +80,8 @@ require "gclouder/resources/pubsub/subscriptions"
 
 require "gclouder/resources/logging/sinks"
 
+require "gclouder/resources/functions/function"
+
 module GClouder
   include GClouder::Logging
   include GClouder::Config::CLIArgs
@@ -253,6 +255,12 @@ module GClouder
         module: Resources::PubSub::Subscriptions,
         skip: [ :check ],
       },
+
+      {
+        name: "functions",
+        module: Resources::Functions::Function,
+        skip: [ :check, :clean ],
+      },
     ]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gclouder
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Rob Wilson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -187,6 +187,7 @@ files:
 - assets/arguments/container/node-pools.yml
 - assets/arguments/dns/managed-zones.yml
 - assets/arguments/dns/record-sets/transaction.yml
+- assets/arguments/functions.yml
 - assets/defaults/compute/disks.yml
 - assets/mappings/file.yml
 - assets/mappings/property.yml
@@ -245,6 +246,7 @@ files:
 - lib/gclouder/resources/container/clusters.rb
 - lib/gclouder/resources/container/node_pools.rb
 - lib/gclouder/resources/dns.rb
+- lib/gclouder/resources/functions/function.rb
 - lib/gclouder/resources/logging/sinks.rb
 - lib/gclouder/resources/project.rb
 - lib/gclouder/resources/project/iam_policy_binding.rb