Skip to content

chore(deps): update gapic-generator-java-bom.version to v2.35.0 #2570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Feb 14, 2024
Merged

chore(deps): update gapic-generator-java-bom.version to v2.35.0 #2570

merged 3 commits into from
Feb 14, 2024

Conversation

renovate-bot
Copy link
Contributor

@renovate-bot renovate-bot commented Feb 1, 2024 •
edited
Loading

Mend Renovate

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
com.google.api:gapic-generator-java 2.33.0 -> 2.35.0 age adoption passing confidence
com.google.api:gapic-generator-java-bom 2.33.0 -> 2.35.0 age adoption passing confidence

Warning

Some dependencies could not be looked up. Check the Dependency Dashboard for more information.

Release Notes

googleapis/sdk-platform-java (com.google.api:gapic-generator-java)

v2.35.0

Compare Source

Features
Bug Fixes
Dependencies

v2.34.0

Compare Source

Features
Bug Fixes
  • Endpoint resolution uses user set endpoint from ClientSettings (#​2429) (46b0a85)
  • Move direct path misconfiguration log to before creating the first channel (#​2430) (9916540)

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about these updates again.

  • If you want to rebase/retry this PR, check this box

This PR has been generated by Mend Renovate. View repository job log here.

@renovate-bot renovate-bot requested a review from a team as a code owner February 1, 2024 03:59
@forking-renovate forking-renovate bot added the dependencies Pull requests that update a dependency file label Feb 1, 2024
@renovate-bot renovate-bot force-pushed the renovate/gapic-generator-java-bom.version branch from d1b7597 to df84dd4 Compare February 5, 2024 16:56
@renovate-bot renovate-bot force-pushed the renovate/gapic-generator-java-bom.version branch from df84dd4 to 9e37dca Compare February 12, 2024 23:43
@JoeWang1127
Copy link
Contributor

Unit tests failed:

[INFO] Running com.google.cloud.generator.spring.SpringWriterTest
23:53:13.210 [main] INFO  o.s.i.c.DefaultConfiguringBeanFactoryPostProcessor - No bean named 'errorChannel' has been explicitly defined. Therefore, a default PublishSubscribeChannel will be created.
23:53:13.215 [main] INFO  o.s.i.c.DefaultConfiguringBeanFactoryPostProcessor - No bean named 'integrationHeaderChannelRegistry' has been explicitly defined. Therefore, a default DefaultHeaderChannelRegistry will be created.
Error:  Tests run: 3, Failures: 3, Errors: 0, Skipped: 0, Time elapsed: 0.385 s <<< FAILURE! -- in com.google.cloud.generator.spring.SpringWriterTest
Error:  com.google.cloud.generator.spring.SpringWriterTest.buildSpringAdditionalMetadataJsonStringTest -- Time elapsed: 0.327 s <<< FAILURE!
java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:87)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.junit.Assert.assertTrue(Assert.java:53)
	at com.google.api.generator.test.protoloader.TestProtoLoader.parseShowcaseEcho(TestProtoLoader.java:170)
	at com.google.cloud.generator.spring.SpringWriterTest.setUp(SpringWriterTest.java:35)
	at java.base/java.lang.reflect.Method.invoke(Method.java:568)

Error:  com.google.cloud.generator.spring.SpringWriterTest.buildPomStringTest -- Time elapsed: 0.002 s <<< FAILURE!
java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:87)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.junit.Assert.assertTrue(Assert.java:53)
	at com.google.api.generator.test.protoloader.TestProtoLoader.parseShowcaseEcho(TestProtoLoader.java:170)
	at com.google.cloud.generator.spring.SpringWriterTest.setUp(SpringWriterTest.java:35)
	at java.base/java.lang.reflect.Method.invoke(Method.java:568)

@diegomarquezp
Copy link
Contributor

Looks like the gapic-generator-java test proto loader fails to find the echo service yaml

@diegomarquezp
Copy link
Contributor

https://github.com/googleapis/sdk-platform-java/pull/2353/files#diff-b793e0389989c97aa4baa4b4d97b81051015cca7d3ab41d1c6a7ba4de726289d altered the usage of echo_v1beta1.yaml but doesn't seem like it should stop working. My guess is that echo_v1beta1.yaml stopped getting packaged in the test-jar for some reason

@alicejli do you know of any alteration to the way we build the gapic-generator-java test-jar?

@diegomarquezp
Copy link
Contributor

Confirmed that the test-jar compilation of gapic-generator-java was done without issues both for v2.33.0 and v2.34.0

@renovate-bot renovate-bot force-pushed the renovate/gapic-generator-java-bom.version branch from 9e37dca to f3c6504 Compare February 14, 2024 00:44
@renovate-bot renovate-bot changed the title chore(deps): update gapic-generator-java-bom.version to v2.34.0 chore(deps): update gapic-generator-java-bom.version to v2.35.0 Feb 14, 2024
@diegomarquezp
Copy link
Contributor

After modifying ServiceYamlParser as follows

public class ServiceYamlParser {
  public static Optional<com.google.api.Service> parse(String serviceYamlFilePath) {
    if (Strings.isNullOrEmpty(serviceYamlFilePath)) {
      System.out.println("The yaml path is empty");
      return Optional.empty();
    }
    if (!(new File(serviceYamlFilePath)).exists()) {
      System.out.println("The yaml file does not exist");
      return Optional.empty();
    }

The tests print

[INFO] Running com.google.cloud.generator.spring.SpringWriterTest
serviceYamlPath = src/test/resources/echo_v1beta1.yaml
The yaml file does not exist
serviceYamlPath = src/test/resources/echo_v1beta1.yaml
The yaml file does not exist
serviceYamlPath = src/test/resources/echo_v1beta1.yaml
The yaml file does not exist
[ERROR] Tests run: 3, Failures: 3, Errors: 0, Skipped: 0, Time elapsed: 0.004 s <<< FAILURE! -- in com.google.cloud.generator.spring.SpringWriterTest

@diegomarquezp
Copy link
Contributor

This error occurs for GGJ 2.34.0 and 2.35.0. 2.33.0 is successful

@diegomarquezp
Copy link
Contributor

Comparing 2.33.0 and 2.34.0 contents. Seems like the test resources are never included in the first place

[hi on] diegomarquezp@diegomarquezp:~/Desktop/spring-cloud-gcp/spring-cloud-generator$ jar tvf ~/.m2/repository/com/google/api/gapic-generator-java/2.33.0/gapic-generator-java-2.33.0-testlib.jar
     0 Wed Jan 24 20:11:44 UTC 2024 META-INF/
   374 Wed Jan 24 20:11:44 UTC 2024 META-INF/MANIFEST.MF
     0 Wed Jan 24 20:11:44 UTC 2024 com/
     0 Wed Jan 24 20:11:44 UTC 2024 com/google/
     0 Wed Jan 24 20:11:44 UTC 2024 com/google/api/
     0 Wed Jan 24 20:11:44 UTC 2024 com/google/api/generator/
     0 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/
     0 Wed Jan 24 20:11:24 UTC 2024 com/google/api/generator/test/utils/
     0 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/framework/
     0 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/protoloader/
     0 Wed Jan 24 20:11:44 UTC 2024 META-INF/maven/
     0 Wed Jan 24 20:11:44 UTC 2024 META-INF/maven/com.google.api/
     0 Wed Jan 24 20:11:44 UTC 2024 META-INF/maven/com.google.api/gapic-generator-java/
  3545 Wed Jan 24 20:11:24 UTC 2024 com/google/api/generator/test/utils/TestExprBuilder.class
   741 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/utils/LineFormatter.class
   687 Wed Jan 24 20:11:20 UTC 2024 com/google/api/generator/test/framework/Differ$GoldenFileReadException.class
  6264 Wed Jan 24 20:11:20 UTC 2024 com/google/api/generator/test/framework/Assert.class
  3431 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/framework/GoldenFileWriter.class
   631 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/framework/SingleJUnitTestRunner$MissingRequiredArgException.class
   608 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/framework/GoldenFileWriter$SaveCodegenToFileException.class
   631 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/framework/SingleJUnitTestRunner$JUnitClassNotFoundException.class
   678 Wed Jan 24 20:11:20 UTC 2024 com/google/api/generator/test/framework/Differ$ComputeDiffException.class
  3068 Wed Jan 24 20:11:20 UTC 2024 com/google/api/generator/test/framework/Differ.class
  2223 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/framework/SingleJUnitTestRunner.class
   853 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/protoloader/GrpcTestProtoLoader.class
 13182 Wed Jan 24 20:11:20 UTC 2024 com/google/api/generator/test/protoloader/TestProtoLoader.class
  6476 Wed Jan 24 20:11:20 UTC 2024 com/google/api/generator/test/protoloader/RestTestProtoLoader.class
  6339 Wed Jan 24 20:11:22 UTC 2024 com/google/api/generator/test/protoloader/GrpcRestTestProtoLoader.class
 46204 Wed Jan 24 20:10:46 UTC 2024 META-INF/maven/com.google.api/gapic-generator-java/pom.xml
    70 Wed Jan 24 20:11:32 UTC 2024 META-INF/maven/com.google.api/gapic-generator-java/pom.properties
   372 Wed Jan 24 20:11:44 UTC 2024 META-INF/INDEX.LIST
[hi on] diegomarquezp@diegomarquezp:~/Desktop/spring-cloud-gcp/spring-cloud-generator$ jar tvf ~/.m2/repository/com/google/api/gapic-generator-java/2.34.0/gapic-generator-java-2.34.0-testlib.jar
     0 Thu Feb 01 00:27:48 UTC 2024 META-INF/
   374 Thu Feb 01 00:27:48 UTC 2024 META-INF/MANIFEST.MF
     0 Thu Feb 01 00:27:48 UTC 2024 com/
     0 Thu Feb 01 00:27:48 UTC 2024 com/google/
     0 Thu Feb 01 00:27:48 UTC 2024 com/google/api/
     0 Thu Feb 01 00:27:48 UTC 2024 com/google/api/generator/
     0 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/
     0 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/framework/
     0 Thu Feb 01 00:27:28 UTC 2024 com/google/api/generator/test/utils/
     0 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/protoloader/
     0 Thu Feb 01 00:27:48 UTC 2024 META-INF/maven/
     0 Thu Feb 01 00:27:48 UTC 2024 META-INF/maven/com.google.api/
     0 Thu Feb 01 00:27:48 UTC 2024 META-INF/maven/com.google.api/gapic-generator-java/
   687 Thu Feb 01 00:27:24 UTC 2024 com/google/api/generator/test/framework/Differ$GoldenFileReadException.class
   608 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/framework/GoldenFileWriter$SaveCodegenToFileException.class
   631 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/framework/SingleJUnitTestRunner$JUnitClassNotFoundException.class
  3068 Thu Feb 01 00:27:24 UTC 2024 com/google/api/generator/test/framework/Differ.class
   631 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/framework/SingleJUnitTestRunner$MissingRequiredArgException.class
  3431 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/framework/GoldenFileWriter.class
   678 Thu Feb 01 00:27:24 UTC 2024 com/google/api/generator/test/framework/Differ$ComputeDiffException.class
  6264 Thu Feb 01 00:27:24 UTC 2024 com/google/api/generator/test/framework/Assert.class
  2223 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/framework/SingleJUnitTestRunner.class
   741 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/utils/LineFormatter.class
  3545 Thu Feb 01 00:27:28 UTC 2024 com/google/api/generator/test/utils/TestExprBuilder.class
  6339 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/protoloader/GrpcRestTestProtoLoader.class
  6476 Thu Feb 01 00:27:24 UTC 2024 com/google/api/generator/test/protoloader/RestTestProtoLoader.class
 13480 Thu Feb 01 00:27:24 UTC 2024 com/google/api/generator/test/protoloader/TestProtoLoader.class
   853 Thu Feb 01 00:27:26 UTC 2024 com/google/api/generator/test/protoloader/GrpcTestProtoLoader.class
 46204 Thu Feb 01 00:26:50 UTC 2024 META-INF/maven/com.google.api/gapic-generator-java/pom.xml
    70 Thu Feb 01 00:27:36 UTC 2024 META-INF/maven/com.google.api/gapic-generator-java/pom.properties
   372 Thu Feb 01 00:27:48 UTC 2024 META-INF/INDEX.LIST

@diegomarquezp
Copy link
Contributor

The introduction of the ServiceYamlParser to parse echo_v1beta1.yaml was introduced in https://github.com/googleapis/sdk-platform-java/pull/2353/files (between 2.33.0 and 2.34.0). I think we now need to add the src/test/resources folder into the jar (still figuring out how)

This was referenced Feb 14, 2024
Closed
Merged
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@JoeWang1127 JoeWang1127 enabled auto-merge (squash) February 14, 2024 23:29
@JoeWang1127 JoeWang1127 merged commit e60f43e into GoogleCloudPlatform:main Feb 14, 2024
@blakeli0 blakeli0 mentioned this pull request Mar 4, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoeWang1127 JoeWang1127 JoeWang1127 approved these changes

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@renovate-bot @JoeWang1127 @diegomarquezp