diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden index 530dc8a269f9..278fa6bcb124 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden @@ -412,7 +412,7 @@ public class EchoStubSettings extends StubSettings { protected LibraryMetadata getLibraryMetadata() { return LibraryMetadata.newBuilder() .setArtifactName("com.google.cloud:gapic-showcase") - .setRepository("googleapis/sdk-platform-java") + .setRepository("googleapis/google-cloud-java") .setVersion(Version.VERSION) .build(); } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden index 86d749482326..3ca91988a4bd 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden @@ -444,7 +444,7 @@ public class EchoStubSettings extends StubSettings { protected LibraryMetadata getLibraryMetadata() { return LibraryMetadata.newBuilder() .setArtifactName("com.google.cloud:gapic-showcase") - .setRepository("googleapis/sdk-platform-java") + .setRepository("googleapis/google-cloud-java") .setVersion(Version.VERSION) .build(); } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden index 49780b588514..f0bed648a00f 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden @@ -191,7 +191,7 @@ public class WickedStubSettings extends StubSettings { protected LibraryMetadata getLibraryMetadata() { return LibraryMetadata.newBuilder() .setArtifactName("com.google.cloud:gapic-showcase") - .setRepository("googleapis/sdk-platform-java") + .setRepository("googleapis/google-cloud-java") .setVersion(Version.VERSION) .build(); } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/protoparser/PluginArgumentParserTest.java b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/protoparser/PluginArgumentParserTest.java index 848b92f776bf..49eb830dc800 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/protoparser/PluginArgumentParserTest.java +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/protoparser/PluginArgumentParserTest.java @@ -271,7 +271,7 @@ void hasFlag_flagFound() { @Test void parseRepo() { - String repo = "googleapis/sdk-platform-java"; + String repo = "googleapis/google-cloud-java"; String rawArgument = String.format("repo=%s", repo); assertEquals( repo, diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/GrpcRestTestProtoLoader.java b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/GrpcRestTestProtoLoader.java index 653b9b16cd3e..d892208b7c2a 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/GrpcRestTestProtoLoader.java +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/GrpcRestTestProtoLoader.java @@ -43,7 +43,7 @@ public class GrpcRestTestProtoLoader extends TestProtoLoader { private static final GrpcRestTestProtoLoader INSTANCE = new GrpcRestTestProtoLoader(); - private static final String ECHO_SERVICE_REPOSITORY = "googleapis/sdk-platform-java"; + private static final String ECHO_SERVICE_REPOSITORY = "googleapis/google-cloud-java"; private static final String ECHO_SERVICE_ARTIFACT = "com.google.cloud:gapic-showcase"; protected GrpcRestTestProtoLoader() { diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/TestProtoLoader.java b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/TestProtoLoader.java index b14d36e82810..e99b3200715f 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/TestProtoLoader.java +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/test/protoloader/TestProtoLoader.java @@ -73,7 +73,7 @@ public class TestProtoLoader { + " service also exposes methods that explicitly implement server delay, and\n" + " paginated calls. Set the 'showcase-trailer' metadata key on any method\n" + " to have the values echoed in the response trailers."; - private static final String ECHO_SERVICE_REPOSITORY = "googleapis/sdk-platform-java"; + private static final String ECHO_SERVICE_REPOSITORY = "googleapis/google-cloud-java"; private static final String ECHO_SERVICE_ARTIFACT = "com.google.cloud:gapic-showcase"; private static final String LOGGING_SERVICE_ARTIFACT = "com.google.cloud:google-cloud-logging"; private final String testFilesDirectory; diff --git a/sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/.github/scripts/update_generation_config.sh b/sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/.github/scripts/update_generation_config.sh index 74d0e6cc4105..24d97abee3ff 100644 --- a/sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/.github/scripts/update_generation_config.sh +++ b/sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/.github/scripts/update_generation_config.sh @@ -147,7 +147,7 @@ latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-j update_config "gapic_generator_version" "${latest_version}" "${generation_config}" # Update composite action version to latest gapic-generator-java version -update_action "googleapis/sdk-platform-java/.github/scripts" \ +update_action "googleapis/google-cloud-java/sdk-platform-java/.github/scripts" \ "${latest_version}" \ "${workflow}" diff --git a/sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/renovate.json b/sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/renovate.json index d06023793d0d..a226d68f2e02 100644 --- a/sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/renovate.json +++ b/sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/renovate.json @@ -29,9 +29,9 @@ "^.github/workflows/unmanaged_dependency_check.yaml$" ], "matchStrings": [ - "uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n" + "uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v(?.+?)\\n" ], - "depNameTemplate": "com.google.cloud:sdk-platform-java-config", + "depNameTemplate": "com.google.cloud:gapic-libraries-bom", "datasourceTemplate": "maven" } ], diff --git a/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.repo-metadata-proto-only-golden.json b/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.repo-metadata-proto-only-golden.json index 7730cd6987e0..6c54c6ce346f 100644 --- a/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.repo-metadata-proto-only-golden.json +++ b/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.repo-metadata-proto-only-golden.json @@ -7,7 +7,7 @@ "release_level": "preview", "transport": "grpc", "language": "java", - "repo": "googleapis/sdk-platform-java", + "repo": "googleapis/google-cloud-java", "repo_short": "java-bare-metal-solution", "distribution_name": "com.google.cloud:google-cloud-bare-metal-solution", "library_type": "OTHER", diff --git a/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-dns/pom.xml b/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-dns/pom.xml index e04ba73f959e..28bdaad76b99 100644 --- a/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-dns/pom.xml +++ b/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-dns/pom.xml @@ -4,6 +4,6 @@ com.google.cloud google-cloud-dns jar - 2.89.0 + 2.33.0-SNAPSHOT Google Cloud DNS Parent diff --git a/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-service-control/google-cloud-service-control-bom/pom.xml b/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-service-control/google-cloud-service-control-bom/pom.xml index 1eac57cf8d61..483838475d81 100644 --- a/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-service-control/google-cloud-service-control-bom/pom.xml +++ b/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-service-control/google-cloud-service-control-bom/pom.xml @@ -3,6 +3,6 @@ 4.0.0 com.google.cloud google-cloud-service-control-bom - 1.91.0 + 1.35.0-SNAPSHOT pom diff --git a/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-tasks/google-cloud-tasks-bom/pom.xml b/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-tasks/google-cloud-tasks-bom/pom.xml index b53243927e18..3138a26ce791 100644 --- a/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-tasks/google-cloud-tasks-bom/pom.xml +++ b/sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-tasks/google-cloud-tasks-bom/pom.xml @@ -3,6 +3,6 @@ 4.0.0 com.google.cloud google-cloud-tasks-bom - 2.91.0 + 2.35.0-SNAPSHOT pom diff --git a/sdk-platform-java/hermetic_build/library_generation/tests/utilities_unit_tests.py b/sdk-platform-java/hermetic_build/library_generation/tests/utilities_unit_tests.py index ed8ac0b6beda..0708fdb4c556 100644 --- a/sdk-platform-java/hermetic_build/library_generation/tests/utilities_unit_tests.py +++ b/sdk-platform-java/hermetic_build/library_generation/tests/utilities_unit_tests.py @@ -183,7 +183,7 @@ def test_get_library_repository_with_common_protos_returns_sdk_platform_java(sel config = self.__get_a_gen_config(3) library = common_protos result = util.get_library_repository(config, library) - self.assertEqual("googleapis/sdk-platform-java", result) + self.assertEqual("googleapis/google-cloud-java", result) def test_get_library_repository_with_monorepo_returns_google_cloud_java(self): config = self.__get_a_gen_config(2) diff --git a/sdk-platform-java/hermetic_build/library_generation/utils/utilities.py b/sdk-platform-java/hermetic_build/library_generation/utils/utilities.py index d1d44e21bfaf..396189868853 100755 --- a/sdk-platform-java/hermetic_build/library_generation/utils/utilities.py +++ b/sdk-platform-java/hermetic_build/library_generation/utils/utilities.py @@ -26,7 +26,16 @@ from library_generation.utils.proto_path_utils import remove_version_from script_dir = os.path.dirname(os.path.realpath(__file__)) -SDK_PLATFORM_JAVA = "googleapis/sdk-platform-java" + +LIBRARIES_WITHOUT_API_ID = { + "google-auth-library", + "showcase", + "iam", + "api-common", + "common-protos", + "gax", + "core", +} def create_argument(arg_key: str, arg_container: object) -> List[str]: @@ -179,9 +188,7 @@ def get_library_repository( :return: string representing the repository """ - if config.contains_common_protos(): - repo = SDK_PLATFORM_JAVA - elif config.is_monorepo(): + if config.is_monorepo() or config.contains_common_protos(): repo = "googleapis/google-cloud-java" else: repo = f"googleapis/{language}-{library.get_library_name()}" @@ -242,15 +249,16 @@ def generate_postprocessing_prerequisite_files( "repo": repo, "repo_short": f"{language}-{library_name}", "distribution_name": library.get_maven_coordinate(), - "api_id": api_id, - "library_type": library.library_type, - "requires_billing": library.requires_billing, } - # this removal is for java-common-protos and java-iam in - # sdk-platform-java - if repo == SDK_PLATFORM_JAVA: - repo_metadata.pop("api_id") + if ( + library.get_library_name() not in LIBRARIES_WITHOUT_API_ID + and library.library_type != "OTHER" + ): + repo_metadata["api_id"] = api_id + + repo_metadata["library_type"] = library.library_type + repo_metadata["requires_billing"] = library.requires_billing if library.api_reference: repo_metadata["api_reference"] = library.api_reference