Skip to content

Commit 9862492

Browse files
committed
ci: update sdk-platform-java references to google-cloud-java monorepo
Update templates for update_generation_config.sh and renovate.json to use the new action paths and gapic-libraries-bom. Update SDK_PLATFORM_JAVA constant and related tests/goldens. b/503444342
1 parent 8095342 commit 9862492

File tree

11 files changed

+12
-12
lines changed

11 files changed

+12
-12
lines changed

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
412412
protected LibraryMetadata getLibraryMetadata() {
413413
return LibraryMetadata.newBuilder()
414414
.setArtifactName("com.google.cloud:gapic-showcase")
415-
.setRepository("googleapis/sdk-platform-java")
415+
.setRepository("googleapis/google-cloud-java")
416416
.setVersion(Version.VERSION)
417417
.build();
418418
}

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
444444
protected LibraryMetadata getLibraryMetadata() {
445445
return LibraryMetadata.newBuilder()
446446
.setArtifactName("com.google.cloud:gapic-showcase")
447-
.setRepository("googleapis/sdk-platform-java")
447+
.setRepository("googleapis/google-cloud-java")
448448
.setVersion(Version.VERSION)
449449
.build();
450450
}

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public class WickedStubSettings extends StubSettings<WickedStubSettings> {
191191
protected LibraryMetadata getLibraryMetadata() {
192192
return LibraryMetadata.newBuilder()
193193
.setArtifactName("com.google.cloud:gapic-showcase")
194-
.setRepository("googleapis/sdk-platform-java")
194+
.setRepository("googleapis/google-cloud-java")
195195
.setVersion(Version.VERSION)
196196
.build();
197197
}

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/protoparser/PluginArgumentParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ void hasFlag_flagFound() {
271271

272272
@Test
273273
void parseRepo() {
274-
String repo = "googleapis/sdk-platform-java";
274+
String repo = "googleapis/google-cloud-java";
275275
String rawArgument = String.format("repo=%s", repo);
276276
assertEquals(
277277
repo,

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/GrpcRestTestProtoLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
public class GrpcRestTestProtoLoader extends TestProtoLoader {
4545
private static final GrpcRestTestProtoLoader INSTANCE = new GrpcRestTestProtoLoader();
46-
private static final String ECHO_SERVICE_REPOSITORY = "googleapis/sdk-platform-java";
46+
private static final String ECHO_SERVICE_REPOSITORY = "googleapis/google-cloud-java";
4747
private static final String ECHO_SERVICE_ARTIFACT = "com.google.cloud:gapic-showcase";
4848

4949
protected GrpcRestTestProtoLoader() {

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/TestProtoLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class TestProtoLoader {
7373
+ " service also exposes methods that explicitly implement server delay, and\n"
7474
+ " paginated calls. Set the 'showcase-trailer' metadata key on any method\n"
7575
+ " to have the values echoed in the response trailers.";
76-
private static final String ECHO_SERVICE_REPOSITORY = "googleapis/sdk-platform-java";
76+
private static final String ECHO_SERVICE_REPOSITORY = "googleapis/google-cloud-java";
7777
private static final String ECHO_SERVICE_ARTIFACT = "com.google.cloud:gapic-showcase";
7878
private static final String LOGGING_SERVICE_ARTIFACT = "com.google.cloud:google-cloud-logging";
7979
private final String testFilesDirectory;

sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/.github/scripts/update_generation_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-j
147147
update_config "gapic_generator_version" "${latest_version}" "${generation_config}"
148148

149149
# Update composite action version to latest gapic-generator-java version
150-
update_action "googleapis/sdk-platform-java/.github/scripts" \
150+
update_action "googleapis/google-cloud-java/sdk-platform-java/.github/scripts" \
151151
"${latest_version}" \
152152
"${workflow}"
153153

sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/renovate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"^.github/workflows/unmanaged_dependency_check.yaml$"
3030
],
3131
"matchStrings": [
32-
"uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?<currentValue>.+?)\\n"
32+
"uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v(?<currentValue>.+?)\\n"
3333
],
34-
"depNameTemplate": "com.google.cloud:sdk-platform-java-config",
34+
"depNameTemplate": "com.google.cloud:gapic-libraries-bom",
3535
"datasourceTemplate": "maven"
3636
}
3737
],

sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.repo-metadata-proto-only-golden.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"release_level": "preview",
88
"transport": "grpc",
99
"language": "java",
10-
"repo": "googleapis/sdk-platform-java",
10+
"repo": "googleapis/google-cloud-java",
1111
"repo_short": "java-bare-metal-solution",
1212
"distribution_name": "com.google.cloud:google-cloud-bare-metal-solution",
1313
"library_type": "OTHER",

sdk-platform-java/hermetic_build/library_generation/tests/utilities_unit_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def test_get_library_repository_with_common_protos_returns_sdk_platform_java(sel
183183
config = self.__get_a_gen_config(3)
184184
library = common_protos
185185
result = util.get_library_repository(config, library)
186-
self.assertEqual("googleapis/sdk-platform-java", result)
186+
self.assertEqual("googleapis/google-cloud-java", result)
187187

188188
def test_get_library_repository_with_monorepo_returns_google_cloud_java(self):
189189
config = self.__get_a_gen_config(2)

0 commit comments

Comments
 (0)