Skip to content

Commit 1016307

Browse files
m-strzelczykm-strzelczyk
committed
Merge branch 'main' into strzelczyk/ipv6-comment-fix
2 parents ea2d988 + 8622af1 commit 1016307

File tree

532 files changed

+32976
-4863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

532 files changed

+32976
-4863
lines changed

‎.github/CODEOWNERS‎

Lines changed: 45 additions & 43 deletions
Large diffs are not rendered by default.

‎.github/blunderbuss.yml‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ assign_issues:
1616
- GoogleCloudPlatform/java-samples-reviewers
1717

1818
assign_issues_by:
19+
- labels:
20+
- "api: routeoptimization"
21+
to:
22+
- GoogleCloudPlatform/geo-routeoptimization
1923
- labels:
2024
- "api: cloudasset"
2125
to:
2226
- GoogleCloudPlatform/cloud-asset-analysis-team
23-
- GoogleCloudPlatform/cloud-asset-platform-team
2427
- labels:
2528
- 'api: logging'
2629
- 'api: clouderrorreporting'
@@ -35,7 +38,7 @@ assign_issues_by:
3538
- labels:
3639
- 'api: cloudsql'
3740
to:
38-
- GoogleCloudPlatform/infra-db-sdk
41+
- GoogleCloudPlatform/cloud-sql-connectors
3942
- labels:
4043
- 'api: spanner'
4144
to:
@@ -58,10 +61,6 @@ assign_issues_by:
5861
- 'api: storagetransfer'
5962
to:
6063
- GoogleCloudPlatform/cloud-storage-dpes
61-
- labels:
62-
- "api: cloudiot"
63-
to:
64-
- GoogleCloudPlatform/api-iot
6564
- labels:
6665
- "api: pubsub"
6766
- "api: pubsublite"
@@ -89,11 +88,6 @@ assign_issues_by:
8988
- "api: appengine"
9089
to:
9190
- GoogleCloudPlatform/serverless-runtimes
92-
- labels:
93-
- "api: cloudfunctions"
94-
to:
95-
- GoogleCloudPlatform/functions-framework-google
96-
- GoogleCloudPlatform/torus-dpe
9791
- labels:
9892
- "api: bigquerydatatransfer"
9993
to:
@@ -107,7 +101,6 @@ assign_prs_by:
107101
- "api: cloudasset"
108102
to:
109103
- GoogleCloudPlatform/cloud-asset-analysis-team
110-
- GoogleCloudPlatform/cloud-asset-platform-team
111104
- labels:
112105
- 'api: logging'
113106
- 'api: clouderrorreporting'
@@ -122,7 +115,7 @@ assign_prs_by:
122115
- labels:
123116
- 'api: cloudsql'
124117
to:
125-
- GoogleCloudPlatform/infra-db-sdk
118+
- GoogleCloudPlatform/cloud-sql-connectors
126119
- labels:
127120
- 'api: spanner'
128121
to:
@@ -145,10 +138,6 @@ assign_prs_by:
145138
- 'api: storagetransfer'
146139
to:
147140
- GoogleCloudPlatform/cloud-storage-dpes
148-
- labels:
149-
- "api: cloudiot"
150-
to:
151-
- GoogleCloudPlatform/api-iot
152141
- labels:
153142
- "api: pubsub"
154143
- "api: pubsublite"
@@ -176,12 +165,3 @@ assign_prs_by:
176165
- "api: appengine"
177166
to:
178167
- GoogleCloudPlatform/serverless-runtimes
179-
- labels:
180-
- "api: cloudfunctions"
181-
to:
182-
- GoogleCloudPlatform/functions-framework-google
183-
- GoogleCloudPlatform/torus-dpe
184-
- labels:
185-
- "api: bigquerydatatransfer"
186-
to:
187-
- GoogleCloudPlatform/bigquery-data-connectors

‎.github/renovate.json5‎

Lines changed: 92 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,136 @@
1-
// find legacy configuration at https://github.com/GoogleCloudPlatform/java-docs-samples/blob/91792d4da53a12f96032f4556815f7d91f27257b/renovate.json
21
{
3-
"extends": [
4-
"config:recommended",
5-
":approveMajorUpdates",
6-
"schedule:earlyMondays",
7-
":ignoreUnstable",
2+
extends: [
3+
'config:recommended',
4+
':approveMajorUpdates',
5+
'schedule:earlyMondays',
6+
':ignoreUnstable',
87
],
9-
"labels": [
10-
"dependencies",
11-
"automerge"
8+
labels: [
9+
'dependencies',
10+
'automerge',
1211
],
13-
"minimumReleaseAge": "7 days",
14-
"dependencyDashboardLabels": [
15-
"type: process",
12+
minimumReleaseAge: '7 days',
13+
dependencyDashboardLabels: [
14+
'type: process',
1615
],
17-
// discontinue upgrades for java8 code samples
18-
"ignorePaths": ["**/*java8*/**", "**/*java-8*/**"],
19-
"packageRules": [
16+
ignorePaths: [
17+
'**/*java8*/**',
18+
'**/*java-8*/**',
19+
],
20+
packageRules: [
2021
{
21-
"matchCategories": [
22-
"java"
22+
matchCategories: [
23+
'java',
24+
],
25+
addLabels: [
26+
'lang: java',
2327
],
24-
"addLabels": [
25-
"lang: java"
26-
]
2728
},
28-
// TODO: check if auto-merge rules will work at all
2929
{
30-
"matchUpdateTypes": [
31-
"minor",
32-
"patch",
33-
"digest",
34-
"lockFileMaintenance"
30+
matchUpdateTypes: [
31+
'minor',
32+
'patch',
33+
'digest',
34+
'lockFileMaintenance',
3535
],
36-
"automerge": true
36+
automerge: true,
3737
},
3838
{
39-
"matchDepTypes": [
40-
"devDependencies"
39+
matchDepTypes: [
40+
'devDependencies',
4141
],
42-
"automerge": true
42+
automerge: true,
4343
},
44-
// group all Dockerfile dependencies
4544
{
46-
"matchCategories": [
47-
"docker"
48-
],
49-
"matchUpdateTypes": [
50-
"minor",
51-
"patch",
52-
"digest",
53-
"lockFileMaintenance"
54-
],
55-
"groupName": "docker",
56-
"pinDigests": true,
57-
"automerge": true
45+
matchCategories: [
46+
'docker',
47+
],
48+
matchUpdateTypes: [
49+
'minor',
50+
'patch',
51+
'digest',
52+
'lockFileMaintenance',
53+
],
54+
groupName: 'docker',
55+
pinDigests: true,
56+
automerge: true,
5857
},
59-
// group all terraform dependencies for google providers
6058
{
61-
"matchCategories": [
62-
"terraform"
59+
matchCategories: [
60+
'terraform',
61+
],
62+
matchDepTypes: [
63+
'provider',
64+
'required_provider',
6365
],
64-
"matchDepTypes": [
65-
"provider",
66-
"required_provider"
66+
groupName: 'Terraform Google providers',
67+
matchPackageNames: [
68+
'/^google/',
6769
],
68-
"matchPackagePatterns": "^google",
69-
"groupName": "Terraform Google providers",
7070
},
71-
// *** Java dependency rules:
72-
// group *ALL* Java dependencies
7371
{
74-
"matchCategories": [
75-
"java"
72+
matchCategories: [
73+
'java',
7674
],
77-
"matchUpdateTypes": [
78-
"minor",
79-
"patch",
80-
"digest",
81-
"lockFileMaintenance"
75+
matchUpdateTypes: [
76+
'minor',
77+
'patch',
78+
'digest',
79+
'lockFileMaintenance',
8280
],
83-
"groupName": "java",
84-
"automerge": true
81+
groupName: 'java',
82+
automerge: true,
8583
},
86-
// do not allow Spring Boot 3 upgrades yet
8784
{
88-
"matchCategories": [
89-
"java"
85+
matchCategories: [
86+
'java',
9087
],
91-
"matchPackagePatterns": [
92-
"org.springframework.boot"
88+
matchCurrentVersion: '>=2.0.0, <3.0.0',
89+
allowedVersions: '<3',
90+
groupName: 'Spring Boot upgrades for v2',
91+
description: '@akitsch: Spring Boot V3 requires Java 17',
92+
matchPackageNames: [
93+
'/org.springframework.boot/',
9394
],
94-
"matchCurrentVersion": ">=2.0.0, <3.0.0",
95-
"allowedVersions": "<3",
96-
"groupName": "Spring Boot upgrades for v2",
97-
"description": "@akitsch: Spring Boot V3 requires Java 17"
9895
},
99-
// limit micronaut upgrades for versions <= 4
10096
{
101-
"matchPackagePatterns": [
102-
"^io.micronaut"
97+
groupName: 'Micronaut packages',
98+
allowedVersions: '<4',
99+
matchFileNames: [
100+
'appengine-java11/**',
101+
'flexible/java-11/**',
103102
],
104-
"groupName": "Micronaut packages",
105-
"allowedVersions": "<4",
106-
"matchPaths": [
107-
"appengine-java11/**",
108-
"flexible/java-11/**"
103+
description: '@akitsch: Micronaut V4 requires Java 17',
104+
matchPackageNames: [
105+
'/^io.micronaut/',
109106
],
110-
"description": "@akitsch: Micronaut V4 requires Java 17"
111107
},
112-
// disable Scala dependency upgrades
113108
{
114-
"matchPackagePatterns": [
115-
"scala"
109+
enabled: false,
110+
matchPackageNames: [
111+
'/scala/',
116112
],
117-
"enabled": false
118113
},
119114
{
120-
"matchPackagePatterns": [
121-
"^jackson-module-scala"
115+
enabled: false,
116+
matchPackageNames: [
117+
'/^jackson-module-scala/',
122118
],
123-
"enabled": false
124119
},
125-
// disable SQL Spark dependency upgrades
126120
{
127-
"matchPackagePatterns": [
128-
"^spark-sql"
121+
enabled: false,
122+
matchPackageNames: [
123+
'/^spark-sql/',
129124
],
130-
"enabled": false
131125
},
132126
{},
133127
],
134-
"rebaseWhen": "behind-base-branch",
135-
"semanticCommits": "enabled",
136-
"vulnerabilityAlerts": {
137-
"labels": [
138-
"type:security"
128+
rebaseWhen: 'behind-base-branch',
129+
semanticCommits: 'enabled',
130+
vulnerabilityAlerts: {
131+
labels: [
132+
'type:security',
139133
],
140-
"minimumReleaseAge": null
134+
minimumReleaseAge: null,
141135
},
142-
}
136+
}

‎.kokoro/tests/build_cloud_functions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Copyright 2022 Google LLC.
3+
# Copyright 2022 Google LLC
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎.kokoro/tests/build_cloud_run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Copyright 2019 Google LLC.
3+
# Copyright 2019 Google LLC
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎.kokoro/tests/run_prptst_tests.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,4 @@ else
9090
echo -e "\n Testing completed.\n"
9191
fi
9292

93-
# If this is a periodic build, send the test log to the FlakyBot except for Java 8
94-
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
95-
if [[ $JAVA_VERSION != "1.8" && $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
96-
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
97-
$KOKORO_GFILE_DIR/linux_amd64/flakybot
98-
fi
99-
10093
exit $RTN

‎.kokoro/tests/run_test_java.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,4 @@ if [[ "$file" == *"run/"* && ("$file" != *"run/filesystem"* && "$file" != *"run/
9696
fi
9797
fi
9898

99-
# If this is a periodic build, send the test log to the FlakyBot except for Java 8
100-
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
101-
if [[ $JAVA_VERSION != "1.8" && $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
102-
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
103-
$KOKORO_GFILE_DIR/linux_amd64/flakybot
104-
fi
105-
10699
exit $RTN

‎.kokoro/tests/teardown_cloud_functions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Copyright 2022 Google LLC.
3+
# Copyright 2022 Google LLC
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ In this repository, we are looking for patches that:
88
* Fix bugs
99
* Improve clarity and understandability
1010

11-
If you want to contribute a full sample / tutorial, please consider contributing to our [community pages](https://cloud.google.com/community) [[How To](https://cloud.google.com/community/tutorials/write)] ([code](https://github.com/GoogleCloudPlatform/community)).
12-
1311
## Contributor License Agreement
1412

1513
Contributions to this project must be accompanied by a Contributor License

0 commit comments

Comments
 (0)