Skip to content

Commit 83413f2

Browse files
TetyanaYahodskaTetyanaYahodska
committed
Merge branch 'main' into compute_disk_regional_replicated
2 parents 277d663 + 8d282b8 commit 83413f2

File tree

72 files changed

+2085
-2008
lines changed

Some content is hidden

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

72 files changed

+2085
-2008
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
# DEE Platform Ops (DEEPO)
5050
/errorreporting @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
5151
/monitoring @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
52-
/opencensus @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
53-
/trace @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers
5452

5553
# Cloud SDK Databases & Data Analytics teams
5654
# ---* Cloud Native DB
@@ -61,7 +59,7 @@
6159
/storage @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/cloud-storage-dpes
6260
/storage-transfer @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/cloud-storage-dpes
6361
# ---* Infra DB
64-
/cloud-sql @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/infra-db-sdk
62+
/cloud-sql @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/cloud-sql-connectors
6563

6664
# Data & AI
6765
/aiplatform @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/text-embedding

‎.github/blunderbuss.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ assign_issues_by:
3838
- labels:
3939
- 'api: cloudsql'
4040
to:
41-
- GoogleCloudPlatform/infra-db-sdk
41+
- GoogleCloudPlatform/cloud-sql-connectors
4242
- labels:
4343
- 'api: spanner'
4444
to:
@@ -115,7 +115,7 @@ assign_prs_by:
115115
- labels:
116116
- 'api: cloudsql'
117117
to:
118-
- GoogleCloudPlatform/infra-db-sdk
118+
- GoogleCloudPlatform/cloud-sql-connectors
119119
- labels:
120120
- 'api: spanner'
121121
to:

‎.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+
}

‎appengine-java8/datastore/src/test/java/com/example/appengine/QueriesTest.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -430,32 +430,6 @@ public void queryInterface_multipleFilters_printsMatchedEntities() throws Except
430430
assertThat(buf.toString()).doesNotContain("Charlie");
431431
}
432432

433-
@Test
434-
public void queryInterface_singleFilter_returnsMatchedEntities() throws Exception {
435-
// Arrange
436-
Entity a = new Entity("Person", "a");
437-
a.setProperty("height", 100);
438-
Entity b = new Entity("Person", "b");
439-
b.setProperty("height", 150);
440-
Entity c = new Entity("Person", "c");
441-
c.setProperty("height", 300);
442-
datastore.put(ImmutableList.<Entity>of(a, b, c));
443-
444-
// Act
445-
long minHeight = 150;
446-
// [START gae_java8_datastore_interface_2]
447-
Filter heightMinFilter =
448-
new FilterPredicate("height", FilterOperator.GREATER_THAN_OR_EQUAL, minHeight);
449-
450-
Query q = new Query("Person").setFilter(heightMinFilter);
451-
// [END gae_java8_datastore_interface_2]
452-
453-
// Assert
454-
List<Entity> results =
455-
datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
456-
assertWithMessage("query results").that(results).containsExactly(b, c);
457-
}
458-
459433
@Test
460434
public void queryInterface_orFilter_printsMatchedEntities() throws Exception {
461435
// Arrange

‎automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModel.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)