CORE-391: upgrade TCL to 1.1.38 (#1840)

* upgrade TCL to 1.1.38

* try 1.1.21

* back to 1.1.38, since that matches the spring boot version

* disable otel by default

* exclude from TPS client

* dont explicitly pull in client-java

* latest BPM client

* update k8s client and bpm client

* upgrade LZS libraries

* bump crl to fix gson serialization errors

---------

Co-authored-by: Marcus Talbott <[email protected]>

Author: davidangb

buildSrc/src/main/groovy/terra-workspace-manager.java-spring-conventions.gradle

@@ -5,7 +5,3 @@ plugins {
     id 'io.spring.dependency-management'
     id 'org.springframework.boot'
 }
-
-// Spring Boot 3.2.3 pulls in opentelemetry-bom 1.31.0.
-// It must have version >= 1.34.1 for compatibility with terra-common-lib 1.0.9:
-ext['opentelemetry.version'] = '1.36.0'

integration/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     implementation 'bio.terra:terra-test-runner:0.2.1-SNAPSHOT'
 
     // Use Terra Common Library on client side to retry direct Sam calls
-    implementation("bio.terra:terra-common-lib:1.1.11-SNAPSHOT") {
+    implementation("bio.terra:terra-common-lib:1.1.38-SNAPSHOT") {
         exclude group: "org.broadinstitute.dsde.workbench", module: "sam-client_2.13"
     }
 

service/dependencies.gradle

@@ -23,29 +23,32 @@ dependencies {
 
   // Terra deps
   implementation group: "bio.terra", name: "datarepo-client", version: "2.13.0-SNAPSHOT"
-  implementation group: "bio.terra", name:"billing-profile-manager-client", version: "0.1.536-SNAPSHOT"
-  implementation group: "bio.terra", name:"terra-policy-client", version:"1.0.9-SNAPSHOT"
+  implementation group: "bio.terra", name:"billing-profile-manager-client", version: "0.1.611-SNAPSHOT"
+  implementation(group: "bio.terra", name:"terra-policy-client", version:"1.0.9-SNAPSHOT") {
+    // this conflicts with TCL-provided otel libraries
+    exclude group: 'io.opentelemetry.instrumentation', module: 'opentelemetry-spring-boot'
+  }
   implementation group: "bio.terra", name:"terra-aws-resource-discovery", version:"v0.6.4-SNAPSHOT"
 
   // hk2 is required to use datarepo client, but not correctly exposed by the client
   implementation group: "org.glassfish.jersey.inject", name: "jersey-hk2"
 
   // OpenTelemetry @WithSpan annotations:
-  implementation 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.2.0'
+  implementation 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.12.0'
 
-  // Get stairway via TCL
-  implementation("bio.terra:terra-common-lib:1.1.11-SNAPSHOT")
+  // Get stairway and k8s client via TCL
+  implementation("bio.terra:terra-common-lib:1.1.38-SNAPSHOT")
 
   // sam
   implementation group: "org.broadinstitute.dsde.workbench", name: "sam-client_2.13", version: "v0.0.332"
   implementation group: "bio.terra", name: "terra-resource-buffer-client", version: "0.198.42-SNAPSHOT"
 
   // Cloud Resource Library
-  implementation group: 'bio.terra', name: 'terra-cloud-resource-lib', version: "1.2.31-SNAPSHOT"
+  implementation group: 'bio.terra', name: 'terra-cloud-resource-lib', version: "1.2.34-SNAPSHOT"
 
   // Terra Landing Zone Service
-  implementation ('bio.terra:terra-landing-zone-service:0.0.367-SNAPSHOT')
-  implementation ('bio.terra:landing-zone-service-client:0.0.367-SNAPSHOT')
+  implementation ('bio.terra:terra-landing-zone-service:0.0.390-SNAPSHOT')
+  implementation ('bio.terra:landing-zone-service-client:0.0.390-SNAPSHOT')
 
   // Storage transfer service
   implementation group: 'com.google.apis', name: 'google-api-services-storagetransfer', version: 'v1-rev20230831-2.0.0'
@@ -72,7 +75,9 @@ dependencies {
   implementation group: "io.micrometer", name: "micrometer-registry-prometheus"
 
   implementation group: "commons-validator", name: "commons-validator", version: "1.7"
-  implementation group: "io.kubernetes", name: "client-java", version: "20.0.1" // Do not use -legacy versions
+  // Should match the version used in terra-common-lib
+  // Do not use -legacy versions
+  implementation group: "io.kubernetes", name: "client-java", version: "23.0.0"
   constraints {
     implementation('org.bouncycastle:bcprov-jdk18on:1.78') {
       because 'https://broadworkbench.atlassian.net/browse/WOR-1652'

service/src/main/java/bio/terra/workspace/service/spendprofile/SpendProfileService.java

@@ -224,7 +224,7 @@ public SpendProfile createGcpSpendProfile(
   @VisibleForTesting
   public void deleteProfile(UUID profileId, AuthenticatedUserRequest userRequest) {
     try {
-      getProfileApi(userRequest).deleteProfile(profileId);
+      getProfileApi(userRequest).deleteProfile(profileId, userRequest.getSubjectId());
     } catch (ApiException e) {
       throw new BillingProfileManagerServiceAPIException(e);
     }