diff --git a/README.md b/README.md index 31ef3b81..7e5bf51f 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,11 @@ Flutter is better run via an [IDE](https://docs.flutter.dev/get-started/editor?t Add a new item to your cart using the command-line: ```bash -curl -i --json '{"userId": "Larry", "item": {"productId": "OLJCESPC7Z", "quantity": 1}}' localhost:8892/ingress/cart/add +curl -i --json '{"userId": "Larry", "item": {"productId": "OLJCESPC7Z", "quantity": 1}}' localhost:8891/cart/add ``` + Response + ``` HTTP/1.1 200 OK Content-Type: application/json; charset=utf-8 @@ -90,9 +92,11 @@ curl --json '{ "expirationMonth": 6 } } -' localhost:8892/ingress/checkout/Larry | jq . +' localhost:8891/checkout/Larry | jq . ``` + Response + ``` { "id": "19031e2c-a4b3-49fe-bbb8-464bc8707559", diff --git a/bin/.ftl-0.231.1.pkg b/bin/.ftl-0.234.0.pkg similarity index 100% rename from bin/.ftl-0.231.1.pkg rename to bin/.ftl-0.234.0.pkg diff --git a/bin/ftl b/bin/ftl index cd8d411f..76fe7582 120000 --- a/bin/ftl +++ b/bin/ftl @@ -1 +1 @@ -.ftl-0.231.1.pkg \ No newline at end of file +.ftl-0.234.0.pkg \ No newline at end of file diff --git a/go/http/http.go b/go/http/http.go index 86e29182..5158c3d0 100644 --- a/go/http/http.go +++ b/go/http/http.go @@ -27,8 +27,8 @@ type ErrorResponse struct { Error string `json:"error"` } -// Example: curl -i http://localhost:8892/ingress/http/users/123/posts?postId=456 -// Error Example: curl -i http://localhost:8892/ingress/http/users/000/posts?postId=456 +// Example: curl -i http://localhost:8891/http/users/123/posts?postId=456 +// Error Example: curl -i http://localhost:8891/http/users/000/posts?postId=456 // //ftl:ingress http GET /http/users/{userId}/posts func Get(ctx context.Context, req builtin.HttpRequest[GetRequest]) (builtin.HttpResponse[GetResponse, ErrorResponse], error) { @@ -58,7 +58,7 @@ type PostResponse struct { Success bool `json:"success"` } -// Example: curl -i --json '{"user_id": 123, "post_id": 345}' http://localhost:8892/ingress/http/users +// Example: curl -i --json '{"user_id": 123, "post_id": 345}' http://localhost:8891/http/users // //ftl:ingress http POST /http/users func Post(ctx context.Context, req builtin.HttpRequest[PostRequest]) (builtin.HttpResponse[PostResponse, ftl.Unit], error) { @@ -76,7 +76,7 @@ type PutRequest struct { type PutResponse struct{} -// Example: curl -X PUT http://localhost:8892/ingress/http/users/123 -d '{"postId": "123"}' +// Example: curl -X PUT http://localhost:8891/http/users/123 -d '{"postId": "123"}' // //ftl:ingress http PUT /http/users/{userId} func Put(ctx context.Context, req builtin.HttpRequest[PutRequest]) (builtin.HttpResponse[PutResponse, ftl.Unit], error) { @@ -92,7 +92,7 @@ type DeleteRequest struct { type DeleteResponse struct{} -// Example: curl -X DELETE http://localhost:8892/ingress/http/users/123 +// Example: curl -X DELETE http://localhost:8891/http/users/123 // //ftl:ingress http DELETE /http/users/{userId} func Delete(ctx context.Context, req builtin.HttpRequest[DeleteRequest]) (builtin.HttpResponse[DeleteResponse, ftl.Unit], error) { diff --git a/kotlin/http/src/main/kotlin/ftl/http/Http.kt b/kotlin/http/src/main/kotlin/ftl/http/Http.kt index d4a41e57..36e15716 100644 --- a/kotlin/http/src/main/kotlin/ftl/http/Http.kt +++ b/kotlin/http/src/main/kotlin/ftl/http/Http.kt @@ -41,8 +41,8 @@ data class DeleteRequest( @Json("userId") val userID: String, ) -// Example: curl -i http://localhost:8892/ingress/http/users/123/posts?postId=456 -// Error Example: curl -i http://localhost:8892/ingress/http/users/000/posts?postId=456 +// Example: curl -i http://localhost:8891/http/users/123/posts?postId=456 +// Error Example: curl -i http://localhost:8891/http/users/000/posts?postId=456 @HttpIngress(Method.GET, "/http/users/{userId}/posts") fun `get`(context: Context, req: HttpRequest): HttpResponse { return HttpResponse( @@ -55,7 +55,7 @@ fun `get`(context: Context, req: HttpRequest): HttpResponse): HttpResponse { return HttpResponse( @@ -65,7 +65,7 @@ fun post(context: Context, req: HttpRequest): HttpResponse): HttpResponse { return HttpResponse( @@ -75,7 +75,7 @@ fun put(context: Context, req: HttpRequest): HttpResponse): HttpResponse { return HttpResponse( diff --git a/online-boutique/backend/services/ad/go.mod b/online-boutique/backend/services/ad/go.mod index 5209bf3b..cb8b6470 100644 --- a/online-boutique/backend/services/ad/go.mod +++ b/online-boutique/backend/services/ad/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace github.com/TBD54566975/ftl/examples/online-boutique => ../.. require ( - github.com/TBD54566975/ftl v0.231.1 + github.com/TBD54566975/ftl v0.234.0 github.com/TBD54566975/ftl/examples/online-boutique v0.0.0-00010101000000-000000000000 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 ) diff --git a/online-boutique/backend/services/ad/go.sum b/online-boutique/backend/services/ad/go.sum index 3f39712f..319ebdfc 100644 --- a/online-boutique/backend/services/ad/go.sum +++ b/online-boutique/backend/services/ad/go.sum @@ -4,8 +4,8 @@ connectrpc.com/grpcreflect v1.2.0 h1:Q6og1S7HinmtbEuBvARLNwYmTbhEGRpHDhqrPNlmK+U connectrpc.com/grpcreflect v1.2.0/go.mod h1:nwSOKmE8nU5u/CidgHtPYk1PFI3U9ignz7iDMxOYkSY= connectrpc.com/otelconnect v0.7.0 h1:ZH55ZZtcJOTKWWLy3qmL4Pam4RzRWBJFOqTPyAqCXkY= connectrpc.com/otelconnect v0.7.0/go.mod h1:Bt2ivBymHZHqxvo4HkJ0EwHuUzQN6k2l0oH+mp/8nwc= -github.com/TBD54566975/ftl v0.231.1 h1:qudqDPuTxGGveJu2KkYiwjFvIqCwUgXMDWhCS0RdVT8= -github.com/TBD54566975/ftl v0.231.1/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= +github.com/TBD54566975/ftl v0.234.0 h1:Mq8N1NpnW/Y0r+8lgVYtI4Otqu86/WxpXToAIZHl4+c= +github.com/TBD54566975/ftl v0.234.0/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= diff --git a/online-boutique/backend/services/cart/go.mod b/online-boutique/backend/services/cart/go.mod index cca311a5..56229742 100644 --- a/online-boutique/backend/services/cart/go.mod +++ b/online-boutique/backend/services/cart/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace github.com/TBD54566975/ftl/examples/online-boutique => ../.. require ( - github.com/TBD54566975/ftl v0.231.1 + github.com/TBD54566975/ftl v0.234.0 github.com/hashicorp/golang-lru/v2 v2.0.7 ) diff --git a/online-boutique/backend/services/cart/go.sum b/online-boutique/backend/services/cart/go.sum index 3f39712f..319ebdfc 100644 --- a/online-boutique/backend/services/cart/go.sum +++ b/online-boutique/backend/services/cart/go.sum @@ -4,8 +4,8 @@ connectrpc.com/grpcreflect v1.2.0 h1:Q6og1S7HinmtbEuBvARLNwYmTbhEGRpHDhqrPNlmK+U connectrpc.com/grpcreflect v1.2.0/go.mod h1:nwSOKmE8nU5u/CidgHtPYk1PFI3U9ignz7iDMxOYkSY= connectrpc.com/otelconnect v0.7.0 h1:ZH55ZZtcJOTKWWLy3qmL4Pam4RzRWBJFOqTPyAqCXkY= connectrpc.com/otelconnect v0.7.0/go.mod h1:Bt2ivBymHZHqxvo4HkJ0EwHuUzQN6k2l0oH+mp/8nwc= -github.com/TBD54566975/ftl v0.231.1 h1:qudqDPuTxGGveJu2KkYiwjFvIqCwUgXMDWhCS0RdVT8= -github.com/TBD54566975/ftl v0.231.1/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= +github.com/TBD54566975/ftl v0.234.0 h1:Mq8N1NpnW/Y0r+8lgVYtI4Otqu86/WxpXToAIZHl4+c= +github.com/TBD54566975/ftl v0.234.0/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= diff --git a/online-boutique/backend/services/checkout/go.mod b/online-boutique/backend/services/checkout/go.mod index 3a268232..343c16b3 100644 --- a/online-boutique/backend/services/checkout/go.mod +++ b/online-boutique/backend/services/checkout/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace github.com/TBD54566975/ftl/examples/online-boutique => ../.. require ( - github.com/TBD54566975/ftl v0.231.1 + github.com/TBD54566975/ftl v0.234.0 github.com/TBD54566975/ftl/examples/online-boutique v0.0.0-00010101000000-000000000000 github.com/google/uuid v1.6.0 ) diff --git a/online-boutique/backend/services/checkout/go.sum b/online-boutique/backend/services/checkout/go.sum index 3f39712f..319ebdfc 100644 --- a/online-boutique/backend/services/checkout/go.sum +++ b/online-boutique/backend/services/checkout/go.sum @@ -4,8 +4,8 @@ connectrpc.com/grpcreflect v1.2.0 h1:Q6og1S7HinmtbEuBvARLNwYmTbhEGRpHDhqrPNlmK+U connectrpc.com/grpcreflect v1.2.0/go.mod h1:nwSOKmE8nU5u/CidgHtPYk1PFI3U9ignz7iDMxOYkSY= connectrpc.com/otelconnect v0.7.0 h1:ZH55ZZtcJOTKWWLy3qmL4Pam4RzRWBJFOqTPyAqCXkY= connectrpc.com/otelconnect v0.7.0/go.mod h1:Bt2ivBymHZHqxvo4HkJ0EwHuUzQN6k2l0oH+mp/8nwc= -github.com/TBD54566975/ftl v0.231.1 h1:qudqDPuTxGGveJu2KkYiwjFvIqCwUgXMDWhCS0RdVT8= -github.com/TBD54566975/ftl v0.231.1/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= +github.com/TBD54566975/ftl v0.234.0 h1:Mq8N1NpnW/Y0r+8lgVYtI4Otqu86/WxpXToAIZHl4+c= +github.com/TBD54566975/ftl v0.234.0/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= diff --git a/online-boutique/backend/services/currency/go.mod b/online-boutique/backend/services/currency/go.mod index 54fc06ce..069dc382 100644 --- a/online-boutique/backend/services/currency/go.mod +++ b/online-boutique/backend/services/currency/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace github.com/TBD54566975/ftl/examples/online-boutique => ../.. require ( - github.com/TBD54566975/ftl v0.231.1 + github.com/TBD54566975/ftl v0.234.0 github.com/TBD54566975/ftl/examples/online-boutique v0.0.0-00010101000000-000000000000 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 ) diff --git a/online-boutique/backend/services/currency/go.sum b/online-boutique/backend/services/currency/go.sum index 3f39712f..319ebdfc 100644 --- a/online-boutique/backend/services/currency/go.sum +++ b/online-boutique/backend/services/currency/go.sum @@ -4,8 +4,8 @@ connectrpc.com/grpcreflect v1.2.0 h1:Q6og1S7HinmtbEuBvARLNwYmTbhEGRpHDhqrPNlmK+U connectrpc.com/grpcreflect v1.2.0/go.mod h1:nwSOKmE8nU5u/CidgHtPYk1PFI3U9ignz7iDMxOYkSY= connectrpc.com/otelconnect v0.7.0 h1:ZH55ZZtcJOTKWWLy3qmL4Pam4RzRWBJFOqTPyAqCXkY= connectrpc.com/otelconnect v0.7.0/go.mod h1:Bt2ivBymHZHqxvo4HkJ0EwHuUzQN6k2l0oH+mp/8nwc= -github.com/TBD54566975/ftl v0.231.1 h1:qudqDPuTxGGveJu2KkYiwjFvIqCwUgXMDWhCS0RdVT8= -github.com/TBD54566975/ftl v0.231.1/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= +github.com/TBD54566975/ftl v0.234.0 h1:Mq8N1NpnW/Y0r+8lgVYtI4Otqu86/WxpXToAIZHl4+c= +github.com/TBD54566975/ftl v0.234.0/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= diff --git a/online-boutique/backend/services/payment/go.mod b/online-boutique/backend/services/payment/go.mod index 1e4347ff..b5749d31 100644 --- a/online-boutique/backend/services/payment/go.mod +++ b/online-boutique/backend/services/payment/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace github.com/TBD54566975/ftl/examples/online-boutique => ../.. require ( - github.com/TBD54566975/ftl v0.231.1 + github.com/TBD54566975/ftl v0.234.0 github.com/google/uuid v1.6.0 ) diff --git a/online-boutique/backend/services/payment/go.sum b/online-boutique/backend/services/payment/go.sum index 3f39712f..319ebdfc 100644 --- a/online-boutique/backend/services/payment/go.sum +++ b/online-boutique/backend/services/payment/go.sum @@ -4,8 +4,8 @@ connectrpc.com/grpcreflect v1.2.0 h1:Q6og1S7HinmtbEuBvARLNwYmTbhEGRpHDhqrPNlmK+U connectrpc.com/grpcreflect v1.2.0/go.mod h1:nwSOKmE8nU5u/CidgHtPYk1PFI3U9ignz7iDMxOYkSY= connectrpc.com/otelconnect v0.7.0 h1:ZH55ZZtcJOTKWWLy3qmL4Pam4RzRWBJFOqTPyAqCXkY= connectrpc.com/otelconnect v0.7.0/go.mod h1:Bt2ivBymHZHqxvo4HkJ0EwHuUzQN6k2l0oH+mp/8nwc= -github.com/TBD54566975/ftl v0.231.1 h1:qudqDPuTxGGveJu2KkYiwjFvIqCwUgXMDWhCS0RdVT8= -github.com/TBD54566975/ftl v0.231.1/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= +github.com/TBD54566975/ftl v0.234.0 h1:Mq8N1NpnW/Y0r+8lgVYtI4Otqu86/WxpXToAIZHl4+c= +github.com/TBD54566975/ftl v0.234.0/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= diff --git a/online-boutique/backend/services/productcatalog/go.mod b/online-boutique/backend/services/productcatalog/go.mod index ae6da0f6..6dea4cfa 100644 --- a/online-boutique/backend/services/productcatalog/go.mod +++ b/online-boutique/backend/services/productcatalog/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace github.com/TBD54566975/ftl/examples/online-boutique => ../.. require ( - github.com/TBD54566975/ftl v0.231.1 + github.com/TBD54566975/ftl v0.234.0 github.com/TBD54566975/ftl/examples/online-boutique v0.0.0-00010101000000-000000000000 ) diff --git a/online-boutique/backend/services/productcatalog/go.sum b/online-boutique/backend/services/productcatalog/go.sum index 3f39712f..319ebdfc 100644 --- a/online-boutique/backend/services/productcatalog/go.sum +++ b/online-boutique/backend/services/productcatalog/go.sum @@ -4,8 +4,8 @@ connectrpc.com/grpcreflect v1.2.0 h1:Q6og1S7HinmtbEuBvARLNwYmTbhEGRpHDhqrPNlmK+U connectrpc.com/grpcreflect v1.2.0/go.mod h1:nwSOKmE8nU5u/CidgHtPYk1PFI3U9ignz7iDMxOYkSY= connectrpc.com/otelconnect v0.7.0 h1:ZH55ZZtcJOTKWWLy3qmL4Pam4RzRWBJFOqTPyAqCXkY= connectrpc.com/otelconnect v0.7.0/go.mod h1:Bt2ivBymHZHqxvo4HkJ0EwHuUzQN6k2l0oH+mp/8nwc= -github.com/TBD54566975/ftl v0.231.1 h1:qudqDPuTxGGveJu2KkYiwjFvIqCwUgXMDWhCS0RdVT8= -github.com/TBD54566975/ftl v0.231.1/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= +github.com/TBD54566975/ftl v0.234.0 h1:Mq8N1NpnW/Y0r+8lgVYtI4Otqu86/WxpXToAIZHl4+c= +github.com/TBD54566975/ftl v0.234.0/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= diff --git a/online-boutique/backend/services/recommendation/go.mod b/online-boutique/backend/services/recommendation/go.mod index 06ad7877..6ff0eb5b 100644 --- a/online-boutique/backend/services/recommendation/go.mod +++ b/online-boutique/backend/services/recommendation/go.mod @@ -4,7 +4,7 @@ go 1.22.2 replace github.com/TBD54566975/ftl/examples/online-boutique => ../.. -require github.com/TBD54566975/ftl v0.231.1 +require github.com/TBD54566975/ftl v0.234.0 require ( connectrpc.com/connect v1.16.1 // indirect diff --git a/online-boutique/backend/services/recommendation/go.sum b/online-boutique/backend/services/recommendation/go.sum index 3f39712f..319ebdfc 100644 --- a/online-boutique/backend/services/recommendation/go.sum +++ b/online-boutique/backend/services/recommendation/go.sum @@ -4,8 +4,8 @@ connectrpc.com/grpcreflect v1.2.0 h1:Q6og1S7HinmtbEuBvARLNwYmTbhEGRpHDhqrPNlmK+U connectrpc.com/grpcreflect v1.2.0/go.mod h1:nwSOKmE8nU5u/CidgHtPYk1PFI3U9ignz7iDMxOYkSY= connectrpc.com/otelconnect v0.7.0 h1:ZH55ZZtcJOTKWWLy3qmL4Pam4RzRWBJFOqTPyAqCXkY= connectrpc.com/otelconnect v0.7.0/go.mod h1:Bt2ivBymHZHqxvo4HkJ0EwHuUzQN6k2l0oH+mp/8nwc= -github.com/TBD54566975/ftl v0.231.1 h1:qudqDPuTxGGveJu2KkYiwjFvIqCwUgXMDWhCS0RdVT8= -github.com/TBD54566975/ftl v0.231.1/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= +github.com/TBD54566975/ftl v0.234.0 h1:Mq8N1NpnW/Y0r+8lgVYtI4Otqu86/WxpXToAIZHl4+c= +github.com/TBD54566975/ftl v0.234.0/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= diff --git a/online-boutique/backend/services/shipping/go.mod b/online-boutique/backend/services/shipping/go.mod index e7a4762c..751714d6 100644 --- a/online-boutique/backend/services/shipping/go.mod +++ b/online-boutique/backend/services/shipping/go.mod @@ -4,7 +4,7 @@ go 1.22.2 replace github.com/TBD54566975/ftl/examples/online-boutique => ../.. -require github.com/TBD54566975/ftl v0.231.1 +require github.com/TBD54566975/ftl v0.234.0 require ( connectrpc.com/connect v1.16.1 // indirect diff --git a/online-boutique/backend/services/shipping/go.sum b/online-boutique/backend/services/shipping/go.sum index 3f39712f..319ebdfc 100644 --- a/online-boutique/backend/services/shipping/go.sum +++ b/online-boutique/backend/services/shipping/go.sum @@ -4,8 +4,8 @@ connectrpc.com/grpcreflect v1.2.0 h1:Q6og1S7HinmtbEuBvARLNwYmTbhEGRpHDhqrPNlmK+U connectrpc.com/grpcreflect v1.2.0/go.mod h1:nwSOKmE8nU5u/CidgHtPYk1PFI3U9ignz7iDMxOYkSY= connectrpc.com/otelconnect v0.7.0 h1:ZH55ZZtcJOTKWWLy3qmL4Pam4RzRWBJFOqTPyAqCXkY= connectrpc.com/otelconnect v0.7.0/go.mod h1:Bt2ivBymHZHqxvo4HkJ0EwHuUzQN6k2l0oH+mp/8nwc= -github.com/TBD54566975/ftl v0.231.1 h1:qudqDPuTxGGveJu2KkYiwjFvIqCwUgXMDWhCS0RdVT8= -github.com/TBD54566975/ftl v0.231.1/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= +github.com/TBD54566975/ftl v0.234.0 h1:Mq8N1NpnW/Y0r+8lgVYtI4Otqu86/WxpXToAIZHl4+c= +github.com/TBD54566975/ftl v0.234.0/go.mod h1:oappWBTwAwuiN/6oVDeHdNLuFnKzq3PB0UZqc1AaXV0= github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= diff --git a/online-boutique/mobile/lib/api/ftl_client.dart b/online-boutique/mobile/lib/api/ftl_client.dart index 3c70db31..17040e93 100644 --- a/online-boutique/mobile/lib/api/ftl_client.dart +++ b/online-boutique/mobile/lib/api/ftl_client.dart @@ -30,9 +30,9 @@ class FTLHttpClient { }) { Uri uri; if (requestJson == null || requestJson.isEmpty) { - uri = Uri.http("localhost:8892", '/ingress$path'); + uri = Uri.http("localhost:8891", path); } else { - uri = Uri.http("localhost:8892", '/ingress$path', {'@json': requestJson}); + uri = Uri.http("localhost:8891", path, {'@json': requestJson}); } return httpClient.get(uri, headers: headers); } @@ -43,7 +43,7 @@ class FTLHttpClient { Map? headers, }) { return httpClient.post( - Uri.http(baseUrl, '/ingress$path'), + Uri.http(baseUrl, path), body: json.encode(request), headers: headers, ); diff --git a/online-boutique/mobile/lib/utils/api_providers.dart b/online-boutique/mobile/lib/utils/api_providers.dart index 35ca1f01..0cb3b581 100644 --- a/online-boutique/mobile/lib/utils/api_providers.dart +++ b/online-boutique/mobile/lib/utils/api_providers.dart @@ -6,7 +6,7 @@ import 'package:online_boutique/api/ftl_client.dart'; import 'package:online_boutique/api/productcatalog.dart'; final ftlClientProvider = Provider((ref) { - final host = Platform.isAndroid ? '10.0.2.2' : 'localhost:8892'; + final host = Platform.isAndroid ? '10.0.2.2' : 'localhost:8891'; FTLHttpClient.initialize( baseUrl: host, diff --git a/online-boutique/mobile/templates/ftl_client.dart b/online-boutique/mobile/templates/ftl_client.dart index 3c70db31..17040e93 100644 --- a/online-boutique/mobile/templates/ftl_client.dart +++ b/online-boutique/mobile/templates/ftl_client.dart @@ -30,9 +30,9 @@ class FTLHttpClient { }) { Uri uri; if (requestJson == null || requestJson.isEmpty) { - uri = Uri.http("localhost:8892", '/ingress$path'); + uri = Uri.http("localhost:8891", path); } else { - uri = Uri.http("localhost:8892", '/ingress$path', {'@json': requestJson}); + uri = Uri.http("localhost:8891", path, {'@json': requestJson}); } return httpClient.get(uri, headers: headers); } @@ -43,7 +43,7 @@ class FTLHttpClient { Map? headers, }) { return httpClient.post( - Uri.http(baseUrl, '/ingress$path'), + Uri.http(baseUrl, path), body: json.encode(request), headers: headers, ); diff --git a/online-boutique/web/src/features/products/ProductPage.tsx b/online-boutique/web/src/features/products/ProductPage.tsx index c5bab295..d3eda17f 100644 --- a/online-boutique/web/src/features/products/ProductPage.tsx +++ b/online-boutique/web/src/features/products/ProductPage.tsx @@ -8,7 +8,7 @@ export const ProductPage = () => { const [product, setProduct] = useState() useEffect(() => { - const productsClient = new ProductcatalogClient('http://localhost:8892/ingress') + const productsClient = new ProductcatalogClient('http://localhost:8891') productsClient.list({}).then((response) => { setProduct(response.products.find((product) => product.id.toLowerCase() === productId?.toLowerCase())) }) diff --git a/online-boutique/web/src/features/products/ProductsPage.tsx b/online-boutique/web/src/features/products/ProductsPage.tsx index fbb233a8..d5ee6fb4 100644 --- a/online-boutique/web/src/features/products/ProductsPage.tsx +++ b/online-boutique/web/src/features/products/ProductsPage.tsx @@ -7,7 +7,7 @@ export const ProductsPage = () => { const [products, setProducts] = useState([]) useEffect(() => { - const productsClient = new ProductcatalogClient('http://localhost:8892/ingress') + const productsClient = new ProductcatalogClient('http://localhost:8891') productsClient.list({}).then((response) => setProducts(response.products || [])) }, [])