feat: Java callout server WIP #81

vitor-ciandt · 2024-05-14T21:09:44Z

Adding a java callout server SDK.

callouts/java/service-callout/src/main/java/service/HealthCheckServer.java

callouts/java/service-callout/src/main/java/service/ServiceCallout.java

jstraceski

Good work so far, examples look promising. It's starting to come together.

callouts/java/service-callout/src/main/java/example/add_body/AddBody.java

callouts/java/service-callout/src/main/java/example/add_header/AddHeader.java

callouts/java/service-callout/src/main/java/service/HealthCheckServer.java

callouts/java/service-callout/src/main/java/service/ServiceCallout.java

callouts/java/service-callout/src/main/java/service/ServiceCalloutTools.java

jstraceski

I left a few comments outlining what I see as where we may need to go with following standard java practices. I need to get some confirmation on some of the changes I suggested but this is what we may need to do.

callouts/java/service-callout/src/main/java/service/ServiceCallout.java

callouts/java/service-callout/src/main/java/service/ServiceCalloutTools.java

callouts/java/service-callout/src/test/java/example/AddBodyTest.java

callouts/java/service-callout/src/test/java/example/AddHeaderTest.java

callouts/java/service-callout/src/main/java/service/ServiceCallout.java

callouts/java/service-callout/src/test/java/example/BasicCalloutServerTest.java

marcinpilat · 2024-07-17T16:26:24Z

callouts/java/service-callout/src/test/java/example/BasicCalloutServerTest.java

+        assertTrue(headersResponse.getResponse().getHeaderMutation().getSetHeadersList().stream()
+                .anyMatch(header -> header.getHeader().getKey().equals("request-header")
+                        && header.getHeader().getValue().equals("added-request")));
+        assertTrue(headersResponse.getResponse().getHeaderMutation().getSetHeadersList().stream()
+                .anyMatch(header -> header.getHeader().getKey().equals("c")
+                        && header.getHeader().getValue().equals("d")));
+        assertTrue(headersResponse.getResponse().getClearRouteCache());


[nit] If you would like to assert on protos check out ProtoTruth: usage. It allows comparing actual proto with expected, ignoring fields etc.

callouts/java/service-callout/src/main/java/example/AddHeader.java

callouts/java/service-callout/src/main/java/service/ServiceCallout.java

callouts/java/service-callout/src/main/java/example/Redirect.java

jstraceski

Assorted fixes, let me know if anything doesn't make sense.

callouts/java/service-callout/src/main/java/service/ServiceCallout.java

callouts/java/service-callout/src/main/java/service/ServiceCalloutTools.java

jstraceski · 2024-08-13T18:48:47Z

callouts/java/service-callout/src/main/java/service/ServiceCalloutTools.java

+        if (add != null) {
+            headerBuilder.addAllSetHeaders(add);
+        }
+        if (remove != null) {
+            headerBuilder.addAllRemoveHeaders(remove);
+        }
+        if (clearRouteCache != null) {
+            responseBuilder.setClearRouteCache(clearRouteCache);
+        }


return headersResponseBuilder;

callouts/java/service-callout/src/main/java/service/ServiceCalloutTools.java

jstraceski · 2024-08-13T19:15:14Z

callouts/java/service-callout/src/main/java/service/ServiceCalloutTools.java

+        if (body != null) {
+            bodyBuilder.setBody(ByteString.copyFromUtf8(body));
+        }
+        if (clearBody != null) {
+            bodyBuilder.setClearBody(clearBody);
+        }


We can do something similar to https://github.com/GoogleCloudPlatform/service-extensions/blob/main/callouts/python/extproc/service/callout_tools.py#L149-L161.

callouts/java/service-callout/src/main/java/service/ServiceCalloutTools.java

…the basic server

…the basic callout test

# Conflicts: # callouts/java/service-callout/src/main/java/service/ServiceCallout.java

…xtensions-samples into java-sdk-fixes

… does not exist

pweiber · 2024-10-14T14:43:38Z

@jstraceski Tried a different approach for the BasicCallout tests, let me know if that covers what we discussed

JWT UC added
Removed unused certs
Added back the health check

…xtensions-samples into java-sdk-fixes

Signed-off-by: pweiber <[email protected]>

jstraceski

Apologies for the hiatus, awesome work! mainly just some default configuration asks and a few test changes.

jstraceski · 2024-12-18T19:25:12Z

.github/workflows/callouts-test-python.yml

Is this testing change intended for this pr?

Yes, this change is intended for this PR.

What I did here is to split the docs part so we can address the javadoc generation, in this case we will have separated workflows:

Java

Python

GO (which is not included here)

Common doc files

The initial workflow was made to erase all the files inside the gh-pages folder and publish again, so with the current setup once we make a change into python or java sdk we are going to lose one or the other, splitting the workflows like this is going to fix this problem.

I made an example run with all of them running in the link below in another branch, you can check how it will look like:
They are named "Testing all 3 workflow"
https://github.com/pweiber/service-extensions-samples/actions

And you can check the results here in my gh-pages branch:
https://github.com/pweiber/service-extensions-samples/tree/gh-pages

If you want to do more tests let me know

The format of the tests looks generally good but for the most recent tests I see the output:

Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.272 sec Running example.JwtAuthTest [main] INFO example.JwtAuth - Header: Authorization = <ByteString@167279d1 size=19 contents="***"> [main] ERROR example.JwtAuth - JWT processing error: JWT strings must contain exactly 2 period characters. Found: 0

It looks like an error is being encountered but is not counted?

That's expected since we are testing an invalid scenario (testHandleRequestHeaders_InvalidToken) it shows that output, I believe we are fine in this case

callouts/java/service-callout/src/main/java/service/ServiceCallout.java

callouts/java/service-callout/src/test/java/example/AddBodyTest.java

callouts/java/service-callout/src/test/java/example/AddHeaderTest.java

callouts/java/service-callout/src/test/java/example/RedirectTest.java

Signed-off-by: pweiber <[email protected]>

pweiber · 2025-01-08T16:55:55Z

@jstraceski I still can't mark as resolved the comments so let me know if the changes are fine

jstraceski

Just one more change then I think we should be good to merge.

jstraceski · 2025-01-08T21:21:53Z

callouts/java/service-callout/src/main/java/service/ServiceCallout.java

+        this.healthCheckIp = Optional.ofNullable(builder.healthCheckIp).orElse("0.0.0.0");
+        this.healthCheckPort = Optional.ofNullable(builder.healthCheckPort).orElse(80);
+        this.healthCheckPath = Optional.ofNullable(builder.healthCheckPath).orElse("/");
+        this.combinedHealthCheck = Optional.ofNullable(builder.combinedHealthCheck).orElse(true);


This should be .orElse(false); the health check server should be on by default. Apologies if I wasn't clear before.

Done, should be good now

callouts/java/service-callout/src/main/java/service/ServiceCallout.java

Signed-off-by: pweiber <[email protected]>

vitor-ciandt added 5 commits May 8, 2024 14:35

feat: creating env, health check server and service callout

621f7e1

feat: fixing Callout Server and adding a basic example

34cd5fc

feat: adding certs to the server

461db17

feat: create basic callback server methods

3388421

fix: remove jitpack and add envoy to pom

57c0658

vitor-ciandt requested review from a team as code owners May 14, 2024 21:09

jstraceski reviewed May 15, 2024

View reviewed changes

callouts/java/service-callout/src/main/java/service/HealthCheckServer.java Outdated Show resolved Hide resolved

jstraceski reviewed May 15, 2024

View reviewed changes

callouts/java/service-callout/src/main/java/service/ServiceCallout.java Outdated Show resolved Hide resolved

vitor-ciandt and others added 5 commits May 15, 2024 15:54

feat: adding unit tests

de3fe5b

fix: adding condition to health check server

8cef5e1

feat: adding javadocs

26160d6

feat: adding documentation

fcfd29f

Adding UC1 and UC2

12cf591

jstraceski reviewed Jun 7, 2024

View reviewed changes

victorwoli added 2 commits June 12, 2024 10:57

Fixing some comments

cbd1965

Including header immediate response use-case

175d7ea

jstraceski reviewed Jul 2, 2024

View reviewed changes

jstraceski requested review from martijneken and removed request for martijneken July 10, 2024 12:46

jstraceski assigned jstraceski and unassigned jstraceski Jul 10, 2024

pweiber and others added 3 commits July 16, 2024 18:19

test

02e4ce6

test

a863b7d

Adjusting JUnit tests

3d9b178

marcinpilat reviewed Jul 17, 2024

View reviewed changes

jstraceski reviewed Aug 13, 2024

View reviewed changes

victorwoli and others added 2 commits September 3, 2024 11:37

Minor fixes

027ac76

Server and process refactoring to use builders

9f16ecd

pweiber and others added 13 commits October 9, 2024 11:57

Removing unused certs

5d8fddb

Adjusting ImmediateResponse to use the parent builder

dccb95d

Adding back the separate health check and including the example into …

9f93091

…the basic server

Including a testing server setup and calling the 4 basic methods for …

47d39da

…the basic callout test

Including a health check test for the basic callout test

757e0e0

Merge branch 'java-sdk-fixes-2' into java-sdk-fixes

b3ce855

# Conflicts: # callouts/java/service-callout/src/main/java/service/ServiceCallout.java

Fixing InvalidToken Test

7ced7ec

Fixing InvalidToken Test

2a61551

Merge branch 'java-sdk-fixes' of https://github.com/pweiber/service-e…

a99d1b5

…xtensions-samples into java-sdk-fixes

Fix for readFileToBytes error test, since it expects a null when file…

bc25d75

… does not exist

Delete callouts/.idea directory

295e5c2

Delete callouts/java/service-callout/.idea directory

2800c69

Delete callouts/java/service-callout/dependency-reduced-pom.xml

1f8ec54

victorwoli and others added 7 commits October 17, 2024 11:09

Including Java Workflow

dd63fe5

Merge branch 'java-sdk-fixes' of https://github.com/pweiber/service-e…

d112af2

…xtensions-samples into java-sdk-fixes

Readjusting basiccallout test to use the example server

9ed3a09

Merge branch 'GoogleCloudPlatform:main' into java-sdk-fixes

918ecc7

Workflow changes to consider the java build and documentation

2930cf1

Signed-off-by: pweiber <[email protected]>

Adding docker images alternative and updating readme

777d47c

Signed-off-by: pweiber <[email protected]>

Merge branch 'refs/heads/java-sdk-fixes' into java-sdk

cc00df3

jstraceski reviewed Dec 18, 2024

View reviewed changes

pweiber added 5 commits December 19, 2024 11:10

Merge branch 'GoogleCloudPlatform:main' into java-sdk-fixes

c60649d

Adjusting tests and adding more server scenarios

f40e647

Signed-off-by: pweiber <[email protected]>

Adjusting port values and changing the health check to be default

c9eee72

Signed-off-by: pweiber <[email protected]>

Changing testing port due to github workflow

cc68e11

Signed-off-by: pweiber <[email protected]>

Merge branch 'GoogleCloudPlatform:main' into java-sdk-fixes

1fcb835

jstraceski reviewed Jan 8, 2025

View reviewed changes

Changing healthcheck default and adjusting tests

3e190b4

Signed-off-by: pweiber <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Java callout server WIP #81

feat: Java callout server WIP #81

vitor-ciandt commented May 14, 2024

jstraceski left a comment

jstraceski left a comment

marcinpilat Jul 17, 2024

jstraceski left a comment

jstraceski Aug 13, 2024

jstraceski Aug 13, 2024

pweiber commented Oct 14, 2024

jstraceski left a comment •

edited

Loading

jstraceski Dec 18, 2024

pweiber Jan 8, 2025

jstraceski Jan 8, 2025

pweiber Jan 9, 2025

pweiber commented Jan 8, 2025

jstraceski left a comment

jstraceski Jan 8, 2025

pweiber Jan 9, 2025

feat: Java callout server WIP #81

Are you sure you want to change the base?

feat: Java callout server WIP #81

Conversation

vitor-ciandt commented May 14, 2024

jstraceski left a comment

Choose a reason for hiding this comment

jstraceski left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jstraceski left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pweiber commented Oct 14, 2024

jstraceski left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pweiber commented Jan 8, 2025

jstraceski left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jstraceski left a comment •

edited

Loading