googleauth 0.16.0 → 0.16.1

data/.toys/.toys.rb

@@ -0,0 +1,45 @@
+# Copyright 2021 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+expand :clean, paths: :gitignore
+
+expand :rspec do |t|
+  t.libs = ["lib", "spec"]
+  t.use_bundler
+end
+
+expand :minitest do |t|
+  t.libs = ["lib", "test"]
+  t.use_bundler
+  t.files = "test/**/*_test.rb"
+end
+
+expand :minitest do |t|
+  t.name = "integration"
+  t.libs = ["lib", "integration"]
+  t.use_bundler
+  t.files = "integration/**/*_test.rb"
+end
+
+expand :rubocop, bundler: true
+
+expand :yardoc do |t|
+  t.generate_output_flag = true
+  # t.fail_on_warning = true
+  t.use_bundler
+end
+
+expand :gem_build
+
+expand :gem_build, name: "install", install_gem: true

data/.toys/ci.rb

@@ -0,0 +1,43 @@
+# Copyright 2021 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+desc "Run CI checks"
+
+TESTS = ["test", "integration", "spec", "rubocop", "yardoc", "build", "linkinator"]
+
+flag :only
+TESTS.each do |name|
+  flag "include_#{name}".to_sym, "--[no-]include-#{name}"
+end
+
+include :exec, result_callback: :handle_result
+include :terminal
+
+def handle_result result
+  if result.success?
+    puts "** #{result.name} passed\n\n", :green, :bold
+  else
+    puts "** CI terminated: #{result.name} failed!", :red, :bold
+    exit 1
+  end
+end
+
+def run
+  ::Dir.chdir context_directory
+  TESTS.each do |name|
+    setting = get "include_#{name}".to_sym
+    setting = !only if setting.nil?
+    exec ["toys", name], name: name.capitalize if setting
+  end
+end

data/.toys/kokoro/.toys.rb

@@ -0,0 +1,66 @@
+# Copyright 2021 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+mixin "kokoro-tools" do
+  def load_env
+    return if defined? @loaded_env
+
+    service_account = "#{::ENV['KOKORO_GFILE_DIR']}/service-account.json"
+    raise "#{service_account} is not a file" unless ::File.file? service_account
+    ::ENV["GOOGLE_APPLICATION_CREDENTIALS"] = service_account
+
+    filename = "#{::ENV['KOKORO_GFILE_DIR']}/ruby_env_vars.json"
+    raise "#{filename} is not a file" unless ::File.file? filename
+    env_vars = ::JSON.parse ::File.read filename
+    env_vars.each { |k, v| ::ENV[k] = v }
+
+    ::ENV["DOCS_CREDENTIALS"] ||= "#{::ENV['KOKORO_KEYSTORE_DIR']}/73713_docuploader_service_account"
+    ::ENV["GITHUB_TOKEN"] ||= "#{::ENV['KOKORO_KEYSTORE_DIR']}/73713_yoshi-automation-github-key"
+
+    @loaded_env = true
+  end
+
+  def package_name
+    @package_name ||=
+      ::ENV["RELEASE_PACKAGE"] || ::ENV["PACKAGE"] || begin
+        files = ::Dir.glob("*.gemspec")
+        raise "Unable to determine package" unless files.length == 1
+        ::File.basename files.first, ".gemspec"
+      end
+  end
+
+  def package_directory
+    @package_directory ||= begin
+      if ::File.file? "#{package_name}.gemspec"
+        ::File.expand_path "."
+      elsif ::File.file? "#{package_name}/#{package_name}.gemspec"
+        ::File.expand_path package_name
+      else
+        raise "Unable to determine package directory"
+      end
+    end
+  end
+
+  def package_gemspec_path
+    @package_gemspec_path ||= ::File.join package_directory, "#{package_name}.gemspec"
+  end
+
+  def package_gemspec
+    @package_gemspec ||= eval ::File.read package_gemspec_path
+  end
+
+  def package_version
+    @package_version ||= package_gemspec.version
+  end
+end

data/.toys/kokoro/publish-docs.rb

@@ -0,0 +1,67 @@
+# Copyright 2021 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "json"
+
+include "kokoro-tools"
+include :exec, e: true
+include :fileutils
+
+flag :credentials, "--credentials=PATH"
+flag :bucket, "--bucket=NAME"
+flag :dry_run, default: ["true", "docs"].include?(::ENV["RELEASE_DRY_RUN"].to_s)
+
+def run
+  ::Dir.chdir package_directory
+  load_env
+  build_docs
+  write_metadata
+  if dry_run
+    puts "DRY RUN: Skipping doc uploading for #{package_name}"
+  else
+    upload_docs
+  end
+end
+
+def build_docs
+  rm_rf "doc"
+  exec ["toys", "yardoc"]
+end
+
+def write_metadata
+  allowed_fields = [
+    "name", "version", "language", "distribution-name",
+    "product-page", "github-repository", "issue-tracker"
+  ]
+  metadata = ::JSON.parse ::File.read ".repo-metadata.json"
+  metadata.transform_keys! { |k| k.tr "_", "-" }
+  metadata.keep_if { |k, _v| allowed_fields.include? k }
+  metadata["version"] = package_version
+  metadata["name"] = metadata["distribution-name"]
+  args = metadata.transform_keys { |k| "--#{k}" }.to_a.flatten
+  cmd = ["python3", "-m", "docuploader", "create-metadata"] + args
+  exec cmd, chdir: "doc"
+end
+
+def upload_docs
+  creds = credentials || "#{::ENV['KOKORO_KEYSTORE_DIR']}/73713_docuploader_service_account"
+  buck = bucket || ::ENV["STAGING_BUCKET"] || "docs-staging"
+  cmd = [
+    "python3", "-m", "docuploader", "upload", ".",
+    "--credentials=#{creds}",
+    "--staging-bucket=#{buck}",
+    "--metadata-file=./docs.metadata"
+  ]
+  exec cmd, chdir: "doc"
+end

data/.toys/kokoro/publish-gem.rb

@@ -0,0 +1,53 @@
+# Copyright 2021 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include "kokoro-tools"
+include :exec, e: true
+include :fileutils
+include :gems
+
+flag :rubygems_token, "--rubygems-token=TOKEN"
+flag :dry_run, default: ["true", "gem"].include?(::ENV["RELEASE_DRY_RUN"].to_s)
+
+def run
+  gem "gems", "~> 1.2"
+  require "gems"
+  ::Dir.chdir package_directory
+  load_env
+  configure_gems
+  gem_path = build_gem
+  if dry_run
+    puts "DRY RUN: Skipping Rubygems push of #{gem_path}"
+  else
+    push_gem gem_path
+  end
+end
+
+def configure_gems
+  token = rubygems_token || ::ENV["RUBYGEMS_API_TOKEN"]
+  ::Gems.configure { |config| config.key = token } if token
+end
+
+def build_gem
+  gem_path = "pkg/#{package_name}-#{package_version}.gem"
+  rm_rf gem_path
+  exec ["toys", "build"]
+  gem_path
+end
+
+def push_gem gem_path
+  response = ::Gems.push ::File.new gem_path
+  puts response
+  raise "Gem push didn't report success" unless response.include? "Successfully registered gem:"
+end

data/.toys/linkinator.rb

@@ -0,0 +1,43 @@
+# Copyright 2021 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+desc "Run Link checks"
+
+flag :install, desc: "Install linkinator instead of running checks"
+
+include :exec, e: true
+include :terminal
+
+def run
+  ::Dir.chdir context_directory
+  if install
+    Kernel.exec "npm install linkinator"
+  else
+    exec_tool ["yardoc"]
+    check_links
+  end
+end
+
+def check_links
+  result = exec ["npx", "linkinator", "./doc"], out: :capture
+  puts result.captured_out
+  checked_links = result.captured_out.split "\n"
+  checked_links.select! { |link| link =~ /^\[(\d+)\]/ && ::Regexp.last_match[1] != "200" }
+  unless checked_links.empty?
+    checked_links.each do |link|
+      puts link, :yellow
+    end
+    exit 1
+  end
+end

data/.trampolinerc

@@ -0,0 +1,48 @@
+# Copyright 2021 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Add required env vars here.
+required_envvars+=(
+)
+
+# Add env vars which are passed down into the container here.
+pass_down_envvars+=(
+    "AUTORELEASE_PR" "RELEASE_DRY_RUN"
+)
+
+# Prevent unintentional override on the default image.
+if [[ "${TRAMPOLINE_IMAGE_UPLOAD:-false}" == "true" ]] && [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then
+    echo "Please set TRAMPOLINE_IMAGE if you want to upload the Docker image."
+    exit 1
+fi
+
+# Define the default value if it makes sense.
+if [[ -z "${TRAMPOLINE_IMAGE_UPLOAD:-}" ]]; then
+    TRAMPOLINE_IMAGE_UPLOAD=""
+fi
+
+if [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then
+    TRAMPOLINE_IMAGE=""
+fi
+
+if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
+    TRAMPOLINE_DOCKERFILE=""
+fi
+
+if [[ -z "${TRAMPOLINE_BUILD_FILE:-}" ]]; then
+    TRAMPOLINE_BUILD_FILE=""
+fi
+
+# Secret Manager secrets.
+source ${PROJECT_ROOT}/.kokoro/populate-secrets.sh

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release History
 
+### [0.16.1](https://www.github.com/googleapis/google-auth-library-ruby/compare/google-auth-library-ruby/v0.16.0...google-auth-library-ruby/v0.16.1) (2021-04-01)
+
+
+### Bug Fixes
+
+* Accept application/text content-type for plain idtoken response ([4948ebb](https://www.github.com/googleapis/google-auth-library-ruby/commit/4948ebb3ca151e9f0433585a41bad6f415416b2d))
+
 ## [0.16.0](https://www.github.com/googleapis/google-auth-library-ruby/compare/v0.15.1...v0.16.0) (2021-03-04)
 
 

data/README.md

@@ -194,7 +194,7 @@ about the Ruby support schedule.
 ## License
 
 This library is licensed under Apache 2.0. Full license text is
-available in [COPYING][copying].
+available in [LICENSE][license].
 
 ## Contributing
 
@@ -210,4 +210,4 @@ about the client or APIs on [StackOverflow](http://stackoverflow.com).
 
 [application default credentials]: https://developers.google.com/accounts/docs/application-default-credentials
 [contributing]: https://github.com/googleapis/google-auth-library-ruby/tree/master/.github/CONTRIBUTING.md
-[copying]: https://github.com/googleapis/google-auth-library-ruby/tree/master/COPYING
+[license]: https://github.com/googleapis/google-auth-library-ruby/tree/master/LICENSE

data/lib/googleauth/compute_engine.rb

@@ -112,7 +112,7 @@ module Google
           case resp.status
           when 200
             content_type = resp.headers["content-type"]
-            if content_type == "text/html"
+            if ["text/html", "application/text"].include? content_type
               { (target_audience ? "id_token" : "access_token") => resp.body }
             else
               Signet::OAuth2.parse_credentials resp.body, content_type

data/lib/googleauth/version.rb

@@ -31,6 +31,6 @@ module Google
   # Module Auth provides classes that provide Google-specific authorization
   # used to access Google APIs.
   module Auth
-    VERSION = "0.16.0".freeze
+    VERSION = "0.16.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: googleauth
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Tim Emiola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -140,32 +140,28 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/ISSUE_TEMPLATE/support_request.md"
-- ".github/workflows/release.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/release-please.yml"
 - ".gitignore"
-- ".kokoro/build.bat"
-- ".kokoro/build.sh"
-- ".kokoro/continuous/common.cfg"
-- ".kokoro/continuous/linux.cfg"
-- ".kokoro/continuous/osx.cfg"
-- ".kokoro/continuous/post.cfg"
-- ".kokoro/continuous/windows.cfg"
-- ".kokoro/osx.sh"
-- ".kokoro/presubmit/common.cfg"
-- ".kokoro/presubmit/linux.cfg"
-- ".kokoro/presubmit/osx.cfg"
-- ".kokoro/presubmit/windows.cfg"
+- ".kokoro/populate-secrets.sh"
 - ".kokoro/release.cfg"
-- ".kokoro/trampoline.bat"
-- ".kokoro/trampoline.sh"
+- ".kokoro/release.sh"
+- ".kokoro/trampoline_v2.sh"
 - ".repo-metadata.json"
 - ".rspec"
 - ".rubocop.yml"
+- ".toys/.toys.rb"
+- ".toys/ci.rb"
+- ".toys/kokoro/.toys.rb"
+- ".toys/kokoro/publish-docs.rb"
+- ".toys/kokoro/publish-gem.rb"
+- ".toys/linkinator.rb"
+- ".trampolinerc"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - googleauth.gemspec
 - integration/helper.rb
 - integration/id_tokens/key_source_test.rb
@@ -192,9 +188,6 @@ files:
 - lib/googleauth/user_refresh.rb
 - lib/googleauth/version.rb
 - lib/googleauth/web_user_authorizer.rb
-- rakelib/devsite_builder.rb
-- rakelib/link_checker.rb
-- rakelib/repo_metadata.rb
 - spec/googleauth/apply_auth_examples.rb
 - spec/googleauth/client_id_spec.rb
 - spec/googleauth/compute_engine_spec.rb
@@ -233,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.2.13
 signing_key: 
 specification_version: 4
 summary: Google Auth Library for Ruby