Merge branch 'main' into toys-gen-pkill

Author: dazuma

.kokoro/populate-secrets.sh

@@ -24,6 +24,10 @@ function msg { println "$*" >&2 ;}
 function println { printf '%s\n' "$(now) $*" ;}
 
 # Populates requested secrets set in SECRET_MANAGER_KEYS
+if [[ -z "${SECRET_MANAGER_PROJECT_ID-}" ]]; then
+  msg "SECRET_MANAGER_PROJECT_ID is not set in environment variables, using default"
+  SECRET_MANAGER_PROJECT_ID="cloud-devrel-kokoro-resources"
+fi
 
 # In Kokoro CI builds, we use the service account attached to the
 # Kokoro VM. This means we need to setup auth on other CI systems.
@@ -65,7 +69,7 @@ do
     msg "Retrieving secret ${key}"
     "${GCLOUD_COMMANDS[@]}" \
         secrets versions access latest \
-        --project cloud-devrel-kokoro-resources \
+        --project "${SECRET_MANAGER_PROJECT_ID}" \
         --secret $key > \
         "$SECRET_LOCATION/$key"
     if [[ $? == 0 ]]; then

.kokoro/release.cfg

@@ -7,36 +7,46 @@ action {
   }
 }
 
-# Download resources for system tests (service account key, etc.)
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-ruby"
-
-# Download trampoline resources.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
 # Use the trampoline script to run in docker.
 build_file: "gapic-generator-ruby/.kokoro/trampoline_v2.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/yoshi-ruby/release"
+  value: "us-central1-docker.pkg.dev/cloud-sdk-release-custom-pool/release-images/ruby-multi"
 }
 
 env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: ".kokoro/release.sh"
 }
 
+env_vars: {
+  key: "SECRET_MANAGER_PROJECT_ID"
+  value: "cloud-sdk-release-custom-pool"
+}
+
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem,docuploader_service_account"
 }
 
+# Pick up Rubygems key from internal keystore
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "rubygems-publish-key"
+      backend: "blade:keystore-fastconfigpush"
+    }
+  }
+}
+
 # Store the packages uploaded to rubygems.org, which
 # we can later use to generate SBOMs and attestations.
 action {
- define_artifacts {
-   regex: "github/gapic-generator-ruby/*/pkg/*.gem"
-   strip_prefix: "github"
- }
+  define_artifacts {
+    regex: "github/gapic-generator-ruby/*/pkg/*.gem"
+    strip_prefix: "github"
+  }
 }

.kokoro/release.sh

@@ -10,4 +10,4 @@ export PATH=$GEM_HOME/bin:$PATH
 gem install --no-document toys
 toys release install-python-tools -v
 python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
-toys release perform -v --enable-docs < /dev/null
+toys release perform -v --force-republish --enable-docs --enable-rad < /dev/null

.kokoro/trampoline_v2.sh

@@ -138,18 +138,26 @@ if [[ -n "${KOKORO_BUILD_ID:-}" ]]; then
     RUNNING_IN_CI="true"
     TRAMPOLINE_CI="kokoro"
     if [[ "${TRAMPOLINE_USE_LEGACY_SERVICE_ACCOUNT:-}" == "true" ]]; then
-	if [[ ! -f "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json" ]]; then
-	    log_red "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json does not exist. Did you forget to mount cloud-devrel-kokoro-resources/trampoline? Aborting."
-	    exit 1
-	fi
-	# This service account will be activated later.
-	TRAMPOLINE_SERVICE_ACCOUNT="${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json"
+        if [[ ! -f "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json" ]]; then
+            log_red "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json does not exist. Did you forget to mount cloud-devrel-kokoro-resources/trampoline? Aborting."
+            exit 1
+        fi
+        # This service account will be activated later.
+        TRAMPOLINE_SERVICE_ACCOUNT="${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json"
     else
-	if [[ "${TRAMPOLINE_VERBOSE:-}" == "true" ]]; then
-	    gcloud auth list
-	fi
-	log_yellow "Configuring Container Registry access"
-	gcloud auth configure-docker --quiet
+        if [[ "${TRAMPOLINE_VERBOSE:-}" == "true" ]]; then
+            gcloud auth list
+        fi
+        log_yellow "Configuring Container Registry access"
+        TRAMPOLINE_HOST=$(echo "${TRAMPOLINE_IMAGE}" | cut -d/ -f1)
+        if [[ ! "${TRAMPOLINE_HOST}" =~ "gcr.io" ]]; then
+            # If you need to specificy a host other than gcr.io, you have to run on an update version of gcloud.
+            echo "TRAMPOLINE_HOST: ${TRAMPOLINE_HOST}"
+            gcloud components update
+            gcloud auth configure-docker "${TRAMPOLINE_HOST}"
+        else
+            gcloud auth configure-docker --quiet
+        fi
     fi
     pass_down_envvars+=(
 	# KOKORO dynamic variables.

.release-please-manifest.json

@@ -1,4 +1,3 @@
 {
-  "gapic": "0.1.0",
-  "gapic-common": "0.22.0"
+  "gapic-common": "0.24.0"
 }

.toys/.toys.rb

@@ -22,7 +22,7 @@
   # directory name to the block.
   #
   def in_directories_with_bundles generator_only: false, include_toys: false
-    non_generator_directories = ["gapic", "gapic-common"]
+    non_generator_directories = ["gapic-common"]
     Dir.chdir context_directory do
       gemfiles = Dir.glob "*/Gemfile"
       gemfiles += Dir.glob ".toys/**/Gemfile" if include_toys && !generator_only

.trampolinerc

@@ -18,7 +18,12 @@ required_envvars+=(
 
 # Add env vars which are passed down into the container here.
 pass_down_envvars+=(
-    "AUTORELEASE_PR" "RELEASE_DRY_RUN" "RELEASE_PACKAGE" "KOKORO_GIT_COMMIT" "RUBY_VERSIONS" "EXTRA_CI_ARGS"
+    "AUTORELEASE_PR"
+    "EXTRA_CI_ARGS"
+    "KOKORO_GIT_COMMIT"
+    "RELEASE_DRY_RUN"
+    "RELEASE_PACKAGE"
+    "RUBY_VERSIONS"
 )
 
 # Prevent unintentional override on the default image.

gapic-common/.rubocop.yml

@@ -6,19 +6,19 @@ AllCops:
     - "test/**/*"
 
 Metrics/ClassLength:
-  Exclude:
-    - "lib/gapic/generic_lro/operation.rb"
-    - "lib/gapic/rest/grpc_transcoder.rb"
+  Max: 200
 
 Metrics/CyclomaticComplexity:
-  Exclude:
-    - "lib/gapic/headers.rb"
-    - "lib/gapic/rest/client_stub.rb"
+  Max: 15
+
+Metrics/MethodLength:
+  Max: 30
 
 Metrics/PerceivedComplexity:
-  Exclude:
-    - "lib/gapic/headers.rb"
-    - "lib/gapic/rest/client_stub.rb"
+  Max: 15
+
+Naming/AccessorMethodName:
+  Enabled: false
 
 Naming/FileName:
   Exclude:

gapic-common/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Release History
 
+### 0.24.0 (2024-12-05)
+
+#### Features
+
+* Log requests and responses ([#1112](https://github.com/googleapis/gapic-generator-ruby/issues/1112)) 
+#### Bug Fixes
+
+* Hardened deadline determination against Time.now hacking ([#942](https://github.com/googleapis/gapic-generator-ruby/issues/942)) 
+
+### 0.23.0 (2024-10-15)
+
+#### Features
+
+* Disable universe domain check if credentials include an explicit request to do so ([#1119](https://github.com/googleapis/gapic-generator-ruby/issues/1119)) 
+
 ### 0.22.0 (2024-07-17)
 
 #### Features

gapic-common/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "concurrent-ruby", "~> 1.3"
+gem "googleapis-common-protos-types", "~> 1.15"
 gem "google-cloud-core", "~> 1.7"
 gem "google-style", "~> 1.30.0"
 gem "grpc-tools", "~> 1.65"