google-cloud-resource_manager 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f14d8ad4d2c7037398aee52815b98ec143a5578925ac85c75072132cb425d2db
-  data.tar.gz: 551fe2be47bcb38054ad62d7045b285a785491e24081e4977a9a840a06faf4b2
+  metadata.gz: 8f8bc39dd1604e2f41633a4e0c696d9d1b2c50622667a31956ef530f0f080669
+  data.tar.gz: 5917ace0ef08d18c88a733a15c6c66d95ebeb37914dc4a3a3338d04007a0858d
 SHA512:
-  metadata.gz: 3382c7586ffbb2970fc042716cb262bb3ce9714a753a306827beb5d25383aeb52ade9e65e6c111da6a30e559798d755c4475faa52a502109a64cb20b2da0f7e7
-  data.tar.gz: 57860ebfabfe514dc895bcda275c91dbe5ba741f5bb5a60887ff906a37a5a9230a79b6c1c8eb76575a0ab934cf8398bd00b9d58333ac14343d5470d3db00eff2
+  metadata.gz: ff7c80520e2d5893322f5564332d8ff062da3a85fad63a1fa644566e18dbd5e5f6ac359442712ee98e7c6d2c802cd39fb823f747caa9465314f3867d29177291
+  data.tar.gz: 5ff7c5dc83b5b26c9dd5a7ff3b6358eb375201c510e06a289f233158b01f84ac1b123d5d69d4aafb12892199757cb0b26f9690342c0db2f0d1ea54e761f81416

data/LICENSE

@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

data/lib/google-cloud-resource_manager.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,6 +21,8 @@
 
 gem "google-cloud-core"
 require "google/cloud"
+require "google/cloud/config"
+require "googleauth"
 
 module Google
   module Cloud
@@ -108,3 +110,21 @@ module Google
     end
   end
 end
+
+# Set the default resource manager configuration
+Google::Cloud.configure.add_config! :resource_manager do |config|
+  default_creds = Google::Cloud::Config.deferred do
+    Google::Cloud::Config.credentials_from_env(
+      "RESOURCE_MANAGER_CREDENTIALS", "RESOURCE_MANAGER_CREDENTIALS_JSON",
+      "RESOURCE_MANAGER_KEYFILE", "RESOURCE_MANAGER_KEYFILE_JSON"
+    )
+  end
+
+  config.add_field! :credentials, default_creds,
+                    match: [String, Hash, Google::Auth::Credentials],
+                    allow_nil: true
+  config.add_alias! :keyfile, :credentials
+  config.add_field! :scope, nil, match: [String, Array]
+  config.add_field! :retries, nil, match: Integer
+  config.add_field! :timeout, nil, match: Integer
+end

data/lib/google/cloud/resource_manager.rb

@@ -1,10 +1,10 @@
-# Copyright 2015 Google Inc. All rights reserved.
+# Copyright 2015 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,8 @@
 
 require "google-cloud-resource_manager"
 require "google/cloud/resource_manager/manager"
+require "google/cloud/config"
+require "google/cloud/env"
 
 module Google
   module Cloud
@@ -257,8 +259,11 @@ module Google
       #
       def self.new credentials: nil, scope: nil, retries: nil, timeout: nil,
                    keyfile: nil
+        scope ||= configure.scope
+        retries ||= configure.retries
+        timeout ||= configure.timeout
         credentials ||= keyfile
-        credentials ||= ResourceManager::Credentials.default(scope: scope)
+        credentials ||= default_credentials(scope: scope)
         unless credentials.is_a? Google::Auth::Credentials
           credentials = ResourceManager::Credentials.new credentials,
                                                          scope: scope
@@ -266,7 +271,41 @@ module Google
 
         ResourceManager::Manager.new(
           ResourceManager::Service.new(
-            credentials, retries: retries, timeout: timeout))
+            credentials, retries: retries, timeout: timeout
+          )
+        )
+      end
+
+      ##
+      # Configure the Google Cloud Resource Manager library.
+      #
+      # The following Resource Manager configuration parameters are supported:
+      #
+      # * `credentials` - (String, Hash, Google::Auth::Credentials) The path to
+      #   the keyfile as a String, the contents of the keyfile as a Hash, or a
+      #   Google::Auth::Credentials object. (See {ResourceManager::Credentials})
+      #   (The parameter `keyfile` is also available but deprecated.)
+      # * `scope` - (String, Array<String>) The OAuth 2.0 scopes controlling
+      #   the set of resources and operations that the connection can access.
+      # * `retries` - (Integer) Number of times to retry requests on server
+      #   error.
+      # * `timeout` - (Integer) Default timeout to use in requests.
+      #
+      # @return [Google::Cloud::Config] The configuration object the
+      #   Google::Cloud::ResourceManager library uses.
+      #
+      def self.configure
+        yield Google::Cloud.configure.resource_manager if block_given?
+
+        Google::Cloud.configure.resource_manager
+      end
+
+      ##
+      # @private Default credentials.
+      def self.default_credentials scope: nil
+        Google::Cloud.configure.resource_manager.credentials ||
+          Google::Cloud.configure.credentials ||
+          ResourceManager::Credentials.default(scope: scope)
       end
     end
   end

data/lib/google/cloud/resource_manager/credentials.rb

@@ -1,10 +1,10 @@
-# Copyright 2015 Google Inc. All rights reserved.
+# Copyright 2015 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -35,19 +35,19 @@ module Google
       #   )
       #
       class Credentials < Google::Auth::Credentials
-        SCOPE = ["https://www.googleapis.com/auth/cloud-platform"]
-        PATH_ENV_VARS = %w(RESOURCE_MANAGER_CREDENTIALS
+        SCOPE = ["https://www.googleapis.com/auth/cloud-platform"].freeze
+        PATH_ENV_VARS = %w[RESOURCE_MANAGER_CREDENTIALS
                            RESOURCE_MANAGER_KEYFILE
                            GOOGLE_CLOUD_CREDENTIALS
                            GOOGLE_CLOUD_KEYFILE
-                           GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(RESOURCE_MANAGER_CREDENTIALS_JSON
+                           GCLOUD_KEYFILE].freeze
+        JSON_ENV_VARS = %w[RESOURCE_MANAGER_CREDENTIALS_JSON
                            RESOURCE_MANAGER_KEYFILE_JSON
                            GOOGLE_CLOUD_CREDENTIALS_JSON
                            GOOGLE_CLOUD_KEYFILE_JSON
-                           GCLOUD_KEYFILE_JSON)
+                           GCLOUD_KEYFILE_JSON].freeze
         DEFAULT_PATHS = \
-          ["~/.config/gcloud/application_default_credentials.json"]
+          ["~/.config/gcloud/application_default_credentials.json"].freeze
       end
     end
   end

data/lib/google/cloud/resource_manager/manager.rb

@@ -1,10 +1,10 @@
-# Copyright 2015 Google Inc. All rights reserved.
+# Copyright 2015 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/google/cloud/resource_manager/policy.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -179,7 +179,7 @@ module Google
         # @private New Policy from a
         # Google::Apis::CloudresourcemanagerV1::Policy object.
         def self.from_gapi gapi
-          roles = gapi.bindings.each_with_object({}) do |binding, memo|
+          roles = Array(gapi.bindings).each_with_object({}) do |binding, memo|
             memo[binding.role] = binding.members.to_a
           end
           new gapi.etag, roles

data/lib/google/cloud/resource_manager/project.rb

@@ -1,10 +1,10 @@
-# Copyright 2015 Google Inc. All rights reserved.
+# Copyright 2015 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -169,7 +169,7 @@ module Google
         #
         def created_at
           Time.parse @gapi.create_time
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -258,7 +258,7 @@ module Google
         def reload!
           @gapi = service.get_project project_id
         end
-        alias_method :refresh!, :reload!
+        alias refresh! reload!
 
         ##
         # Marks the project for deletion. This method will only affect the
@@ -361,7 +361,7 @@ module Google
           policy = Policy.from_gapi gapi
           return policy unless block_given?
           yield policy
-          self.policy = policy
+          update_policy policy
         end
 
         ##
@@ -393,13 +393,14 @@ module Google
         #
         #   policy.add "roles/owner", "user:owner@example.com"
         #
-        #   project.policy = policy # API call
+        #   project.update_policy policy # API call
         #
-        def policy= new_policy
+        def update_policy new_policy
           ensure_service!
           gapi = service.set_policy project_id, new_policy.to_gapi
           Policy.from_gapi gapi
         end
+        alias policy= update_policy
 
         ##
         # Tests the specified permissions against the [Cloud
@@ -445,7 +446,7 @@ module Google
         ##
         # Raise an error unless an active service is available.
         def ensure_service!
-          fail "Must have active connection" unless service
+          raise "Must have active connection" unless service
         end
       end
     end

data/lib/google/cloud/resource_manager/project/list.rb

@@ -1,10 +1,10 @@
-# Copyright 2015 Google Inc. All rights reserved.
+# Copyright 2015 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -157,7 +157,7 @@ module Google
           ##
           # Raise an error unless an active connection is available.
           def ensure_manager!
-            fail "Must have active connection" unless @manager
+            raise "Must have active connection" unless @manager
           end
         end
       end

data/lib/google/cloud/resource_manager/project/updater.rb

@@ -1,10 +1,10 @@
-# Copyright 2015 Google Inc. All rights reserved.
+# Copyright 2015 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/google/cloud/resource_manager/service.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -122,7 +122,7 @@ module Google
         end
 
         def inspect
-          "#{self.class}"
+          self.class.to_s
         end
 
         protected

data/lib/google/cloud/resource_manager/version.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module ResourceManager
-      VERSION = "0.28.0"
+      VERSION = "0.29.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-resource_manager
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.8
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +127,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Resource Manager