Skip to content

Commit cd3ddd6

Browse files
committed
Merge branch 'feat/parallel-hermetic-build' of https://github.com/googleapis/google-cloud-java into feat/parallel-hermetic-build
2 parents 0fa43c0 + df89038 commit cd3ddd6

20 files changed

Lines changed: 408 additions & 64 deletions

File tree

.github/workflows/sdk-platform-java-create_additional_release_tag.yaml renamed to .github/workflows/create_additional_release_tag.yaml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,11 @@
1-
name: sdk-platform-java Create additional tags for each release
1+
name: Create additional tags for each release
22

33
on:
44
release:
55
types: [published]
66
workflow_dispatch:
7-
8-
env:
9-
BUILD_SUBDIR: sdk-platform-java
107
jobs:
11-
filter:
12-
runs-on: ubuntu-latest
13-
outputs:
14-
library: ${{ steps.filter.outputs.library }}
15-
steps:
16-
- uses: actions/checkout@v4
17-
- uses: dorny/paths-filter@v3
18-
id: filter
19-
with:
20-
filters: |
21-
library:
22-
- 'sdk-platform-java/**'
238
build:
24-
needs: filter
25-
if: ${{ needs.filter.outputs.library == 'true' }}
269
runs-on: ubuntu-latest
2710
permissions:
2811
# Permission to create tag
@@ -32,7 +15,7 @@ jobs:
3215
- name: Checkout code
3316
uses: actions/checkout@v4
3417
with:
35-
token: ${{ secrets.GITHUB_TOKEN }}
18+
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
3619
- name: Set up Git
3720
run: |
3821
git config --local user.email "action@github.com"

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ jobs:
1010
with:
1111
distribution: temurin
1212
java-version: 11
13-
- name: Install modules
13+
- name: Install all modules first
1414
shell: bash
15-
run: mvn install -B -ntp -T 1C -DskipTests -Pquick-build
15+
run: .kokoro/build.sh
16+
env:
17+
BUILD_SUBDIR: sdk-platform-java
18+
JOB_TYPE: install
1619
- name: Unmanaged dependency check
1720
uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
1821
with:

generation_config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ libraries:
235235
library_name: asset
236236
release_level: stable
237237
api_reference: https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview
238-
issue_tracker: https://issuetracker.google.com/issues/new?component=187210&template=0
238+
issue_tracker: https://issuetracker.google.com/issues/new?component=187210
239239
GAPICs:
240240
- proto_path: google/cloud/asset/v1
241241
- proto_path: google/cloud/asset/v1p1beta1
@@ -772,7 +772,7 @@ libraries:
772772
api_description: Database Center provides an organization-wide, cross-product fleet
773773
health platform to eliminate the overhead, complexity, and risk associated with
774774
aggregating and summarizing health signals through custom dashboards. Through
775-
Database Centers fleet health dashboard and API, database platform teams that
775+
Database Center's fleet health dashboard and API, database platform teams that
776776
are responsible for reliability, compliance, security, cost, and administration
777777
of database fleets will now have a single pane of glass that pinpoints issues
778778
relevant to each team.
@@ -1331,7 +1331,7 @@ libraries:
13311331
accounts.
13321332
release_level: stable
13331333
requires_billing: false
1334-
issue_tracker: https://issuetracker.google.com/issues/new?component=187161&template=0
1334+
issue_tracker: https://issuetracker.google.com/issues/new?component=187161
13351335
GAPICs:
13361336
- proto_path: google/iam/credentials/v1
13371337
- api_shortname: iap
@@ -2924,7 +2924,7 @@ libraries:
29242924
product_documentation: https://cloud.google.com/web-risk/docs/
29252925
api_description: is a Google Cloud service that lets client applications check URLs
29262926
against Google's constantly updated lists of unsafe web resources. Unsafe web
2927-
resources include social engineering sitessuch as phishing and deceptive sitesand
2927+
resources include social engineering sites - such as phishing and deceptive sites - and
29282928
sites that host malware or unwanted software. With the Web Risk API, you can quickly
29292929
identify known bad sites, warn users before they click infected links, and prevent
29302930
users from posting links to known infected pages from your site. The Web Risk
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
java_library(
2+
name = "credentials",
3+
srcs = glob(["java/**/*.java"]),
4+
visibility = ["//visibility:public"],
5+
)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
java_library(
2+
name = "oauth2_http",
3+
srcs = glob(["java/**/*.java"]),
4+
deps = [
5+
"@com_google_guava_guava//jar",
6+
"@com_google_guava_failureaccess//jar",
7+
"//google-auth-library-java/credentials:credentials",
8+
"@com_google_http_client_google_http_client//jar",
9+
"@com_google_http_client_google_http_client_gson//jar",
10+
"@com_google_api_api_common//jar",
11+
"@com_google_code_gson_gson//jar",
12+
"@com_google_errorprone_error_prone_annotations//jar",
13+
"@com_google_code_findbugs_jsr305//jar",
14+
"@com_google_auto_value_auto_value_annotations//jar",
15+
"@com_google_auto_value_auto_value//jar",
16+
"@org_slf4j_slf4j_api//jar",
17+
],
18+
plugins = ["@com_google_api_gax_java//:auto_value_plugin"],
19+
visibility = ["//visibility:public"],
20+
)

google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,8 @@ Map<String, Object> createMetadataRequestHeaders(AwsCredentialSource awsCredenti
235235
// Both flows work for IDMS v1 and v2. But if IDMSv2 is enabled, then if
236236
// session token is not present, Unauthorized exception will be thrown.
237237
if (awsCredentialSource.imdsv2SessionTokenUrl != null) {
238-
Map<String, Object> tokenRequestHeaders =
239-
new HashMap<String, Object>() {
240-
{
241-
put(AWS_IMDSV2_SESSION_TOKEN_TTL_HEADER, AWS_IMDSV2_SESSION_TOKEN_TTL);
242-
}
243-
};
238+
Map<String, Object> tokenRequestHeaders = new HashMap<>();
239+
tokenRequestHeaders.put(AWS_IMDSV2_SESSION_TOKEN_TTL_HEADER, AWS_IMDSV2_SESSION_TOKEN_TTL);
244240

245241
String imdsv2SessionToken =
246242
retrieveResource(

googleapis

Lines changed: 0 additions & 1 deletion
This file was deleted.

java-asset/.repo-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
"library_type": "GAPIC_AUTO",
1515
"requires_billing": true,
1616
"api_reference": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview",
17-
"issue_tracker": "https://issuetracker.google.com/issues/new?component=187210&template=0"
17+
"issue_tracker": "https://issuetracker.google.com/issues/new?component=187210"
1818
}

java-databasecenter/.repo-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"api_shortname": "databasecenter",
33
"name_pretty": "Database Center API",
44
"product_documentation": "https://cloud.google.com/database-center/docs/overview",
5-
"api_description": "Database Center provides an organization-wide, cross-product fleet health platform to eliminate the overhead, complexity, and risk associated with aggregating and summarizing health signals through custom dashboards. Through Database Center\u2019s fleet health dashboard and API, database platform teams that are responsible for reliability, compliance, security, cost, and administration of database fleets will now have a single pane of glass that pinpoints issues relevant to each team.",
5+
"api_description": "Database Center provides an organization-wide, cross-product fleet health platform to eliminate the overhead, complexity, and risk associated with aggregating and summarizing health signals through custom dashboards. Through Database Center's fleet health dashboard and API, database platform teams that are responsible for reliability, compliance, security, cost, and administration of database fleets will now have a single pane of glass that pinpoints issues relevant to each team.",
66
"client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-databasecenter/latest/overview",
77
"release_level": "preview",
88
"transport": "both",

java-databasecenter/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ to add `google-cloud-databasecenter` as a dependency in your code.
8787
## About Database Center API
8888

8989

90-
[Database Center API][product-docs] Database Center provides an organization-wide, cross-product fleet health platform to eliminate the overhead, complexity, and risk associated with aggregating and summarizing health signals through custom dashboards. Through Database Centers fleet health dashboard and API, database platform teams that are responsible for reliability, compliance, security, cost, and administration of database fleets will now have a single pane of glass that pinpoints issues relevant to each team.
90+
[Database Center API][product-docs] Database Center provides an organization-wide, cross-product fleet health platform to eliminate the overhead, complexity, and risk associated with aggregating and summarizing health signals through custom dashboards. Through Database Center's fleet health dashboard and API, database platform teams that are responsible for reliability, compliance, security, cost, and administration of database fleets will now have a single pane of glass that pinpoints issues relevant to each team.
9191

9292
See the [Database Center API client library docs][javadocs] to learn how to
9393
use this Database Center API Client Library.

0 commit comments

Comments
 (0)