Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumping Google API client to 0.23 #354

Merged
merged 3 commits into from
Jun 7, 2018
Merged

Bumping Google API client to 0.23 #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b38c10
Bumping Google API client to 0.23
Temikus Jun 7, 2018
65c6151
Remove resource views api initialisation
Temikus Jun 7, 2018
ee82c01
Fix error
Temikus Jun 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fog-google.gemspec
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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