feat(gce): support resourceManagerTags in instance template (#1203)

* feat(gce): support resourceManagerTags in instance template * feat(gce): upgrade all google-api-services libraries to be compatible with the api-client.
spinnaker · Sep 25, 2024 · 2f38092 · 2f38092
1 parent 0e45378
commit 2f38092
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/...secrets-gcp/src/main/java/com/netflix/spinnaker/kork/secrets/engines/GcsSecretEngine.java b/...secrets-gcp/src/main/java/com/netflix/spinnaker/kork/secrets/engines/GcsSecretEngine.java
@@ -19,7 +19,7 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.storage.Storage;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.netflix.spinnaker.kork.secrets.EncryptedSecret;
@@ -82,7 +82,7 @@ private Storage getStorage() throws IOException {
 
  if (storage == null) {
  HttpTransport httpTransport = GoogleUtils.buildHttpTransport();
- JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+ JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
  GoogleCredentials credentials = GoogleUtils.buildGoogleCredentials();
  HttpRequestInitializer requestInitializer =
  GoogleUtils.setTimeoutsAndRetryBehavior(credentials);

diff --git a/kork-stackdriver/src/main/java/com/netflix/spectator/stackdriver/ConfigParams.java b/kork-stackdriver/src/main/java/com/netflix/spectator/stackdriver/ConfigParams.java
@@ -20,7 +20,7 @@
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.monitoring.v3.Monitoring;
 import com.google.api.services.monitoring.v3.MonitoringScopes;
 import com.netflix.spectator.api.Measurement;
@@ -106,7 +106,7 @@ public ConfigParams build() {
  if (result.monitoring == null) {
  try {
  HttpTransport transport = GoogleNetHttpTransport.newTrustedTransport();
- JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+ JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
  GoogleCredential credential = loadCredential(transport, jsonFactory, credentialsPath);
  String version = getClass().getPackage().getImplementationVersion();
  if (version == null) {

diff --git a/spinnaker-dependencies/spinnaker-dependencies.gradle b/spinnaker-dependencies/spinnaker-dependencies.gradle
@@ -98,13 +98,13 @@ dependencies {
  force = true
  }
  api("com.amazonaws:aws-java-sdk:${versions.aws}")
- api("com.google.api-client:google-api-client:1.30.10") // TODO: Track update for CVE-2020-7692, reanalysis pending.
- api("com.google.apis:google-api-services-admin-directory:directory_v1-rev105-1.25.0")
- api("com.google.apis:google-api-services-cloudbuild:v1-rev836-1.25.0")
- api("com.google.apis:google-api-services-compute:beta-rev20201102-1.30.10")
- api("com.google.apis:google-api-services-iam:v1-rev267-1.25.0")
- api("com.google.apis:google-api-services-monitoring:v3-rev477-1.25.0")
- api("com.google.apis:google-api-services-storage:v1-rev141-1.25.0")
+ api("com.google.api-client:google-api-client:1.31.5") // TODO: Track update for CVE-2020-7692, reanalysis pending.
+ api("com.google.apis:google-api-services-admin-directory:directory_v1-rev20210531-1.31.5")
+ api("com.google.apis:google-api-services-cloudbuild:v1-rev20210625-1.31.5")
+ api("com.google.apis:google-api-services-compute:beta-rev20210525-1.31.5")
+ api("com.google.apis:google-api-services-iam:v1-rev20210519-1.31.5")
+ api("com.google.apis:google-api-services-monitoring:v3-rev20210618-1.31.5") //v3-rev20210618-1.31.5
+ api("com.google.apis:google-api-services-storage:v1-rev20210127-1.31.5")
  api("com.google.cloud:google-cloud-secretmanager:2.3.10")
  api("com.google.code.findbugs:jsr305:3.0.2")
  api("com.google.guava:guava:33.0.0-jre")