Skip to content

Commit

Permalink
Merge pull request #354 from Temikus/bump_google_client
Browse files Browse the repository at this point in the history
Bumping Google API client to 0.23
  • Loading branch information
Temikus authored Jun 7, 2018
2 parents a2e46a2 + ee82c01 commit c064f4d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 22 deletions.
2 changes: 1 addition & 1 deletion fog-google.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "fog-xml"

# Hard Requirement as of 1.0
spec.add_dependency "google-api-client", "~> 0.19.1"
spec.add_dependency "google-api-client", "~> 0.23.0"

spec.add_development_dependency "coveralls"
spec.add_development_dependency "mime-types"
Expand Down
19 changes: 0 additions & 19 deletions lib/fog/compute/google/mock.rb
Original file line number Diff line number Diff line change
Expand Up @@ -181,25 +181,6 @@ def self.data(api_version)

}
},
:backend_services => {
"test-backend-service" => {
"kind" => "compute#backend_service",
"id" => "1361932147851415729",
"creationTimestamp" => "2014-08-23T10:06:13.951-07:00",
"name" => "test-backend-service",
"description" => "",
"backends" => [
{
"description" => "",
"group" => "https://www.googleapis.com/resourceviews/v1beta1/projects#{@project}/zones/us-central1-a/zoneViews/name",
"balancingMode" => "RATE",
"capacityScaler" => 1.1,
"maxRate" => 0.5
}
],
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/backendServices/test-backend-service"
}
},
:servers => {
"fog-1" => {
"kind" => "compute#instance",
Expand Down
3 changes: 1 addition & 2 deletions lib/fog/google/shared.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,11 @@ def initialize_google_client(options)
require "google/apis/compute_#{Fog::Compute::Google::GOOGLE_COMPUTE_API_VERSION}"
require "google/apis/dns_#{Fog::DNS::Google::GOOGLE_DNS_API_VERSION}"
require "google/apis/pubsub_#{Fog::Google::Pubsub::GOOGLE_PUBSUB_API_VERSION}"
require "google/apis/resourceviews_v1beta2"
require "google/apis/sqladmin_#{Fog::Google::SQL::GOOGLE_SQL_API_VERSION}"
require "google/apis/storage_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_API_VERSION}"
require "googleauth"
rescue LoadError => error
Fog::Logger.error("Please install the google-api-client (>= 0.9) gem before using this provider")
Fog::Errors::Error.new("Please install the google-api-client (>= 0.9) gem before using this provider")
raise error
end

Expand Down

0 comments on commit c064f4d

Please sign in to comment.