Skip to content

Commit ba1eece

Browse files
puckpuckpuckpuck
committed
rename cartservice to cart
1 parent 1f30247 commit ba1eece

32 files changed

+68
-68
lines changed

‎.env

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ AD_SERVICE_ADDR=adservice:${AD_SERVICE_PORT}
5454
AD_SERVICE_DOCKERFILE=./src/adservice/Dockerfile
5555

5656
# Cart Service
57-
CART_SERVICE_PORT=7070
58-
CART_SERVICE_ADDR=cartservice:${CART_SERVICE_PORT}
59-
CART_SERVICE_DOCKERFILE=./src/cartservice/src/Dockerfile
57+
CART_PORT=7070
58+
CART_ADDR=cart:${CART_PORT}
59+
CART_DOCKERFILE=./src/cart/src/Dockerfile
6060

6161
# Checkout Service
6262
CHECKOUT_SERVICE_PORT=5050

‎.github/workflows/component-build-images.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ jobs:
5959
tag_suffix: adservice
6060
context: ./
6161
setup-qemu: true
62-
- file: ./src/cartservice/src/Dockerfile
63-
tag_suffix: cartservice
62+
- file: ./src/cart/src/Dockerfile
63+
tag_suffix: cart
6464
context: ./
6565
setup-qemu: false
6666
- file: ./src/checkoutservice/Dockerfile

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ test/tracetesting/tracetesting-vars.yaml
4444

4545
# Ignore copied/generated protobuf files
4646
/src/accounting/src/protos/
47-
/src/cartservice/src/protos/
47+
/src/cart/src/protos/
4848
/src/featureflagservice/proto/
4949
/src/featureflagservice/src/ffs_demo_pb.erl
5050
/src/featureflagservice/src/ffs_service_*.erl

‎.licenserc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
"ignore": [
4040
"node_modules/",
4141
"/src/accounting/src/protos/",
42-
"src/cartservice/src/obj/",
43-
"src/cartservice/tests/obj/",
42+
"src/cart/src/obj/",
43+
"src/cart/tests/obj/",
4444
"src/checkoutservice/genproto/",
4545
"src/featureflagservice/assets/vendor/",
4646
"src/featureflagservice/priv/",

‎docker-compose-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838
TRACETEST_IMAGE_VERSION: ${TRACETEST_IMAGE_VERSION}
3939
environment:
4040
- AD_SERVICE_ADDR
41-
- CART_SERVICE_ADDR
41+
- CART_ADDR
4242
- CHECKOUT_SERVICE_ADDR
4343
- CURRENCY_SERVICE_ADDR
4444
- EMAIL_SERVICE_ADDR
@@ -61,7 +61,7 @@ services:
6161
condition: service_started
6262
adservice:
6363
condition: service_started
64-
cartservice:
64+
cart:
6565
condition: service_started
6666
checkoutservice:
6767
condition: service_started

‎docker-compose.minimal.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,29 @@ services:
5050
logging: *logging
5151

5252
# Cart service
53-
cartservice:
54-
image: ${IMAGE_NAME}:${DEMO_VERSION}-cartservice
53+
cart:
54+
image: ${IMAGE_NAME}:${DEMO_VERSION}-cart
5555
container_name: cart-service
5656
build:
5757
context: ./
58-
dockerfile: ${CART_SERVICE_DOCKERFILE}
58+
dockerfile: ${CART_DOCKERFILE}
5959
cache_from:
60-
- ${IMAGE_NAME}:${IMAGE_VERSION}-cartservice
60+
- ${IMAGE_NAME}:${IMAGE_VERSION}-cart
6161
deploy:
6262
resources:
6363
limits:
6464
memory: 160M
6565
restart: unless-stopped
6666
ports:
67-
- "${CART_SERVICE_PORT}"
67+
- "${CART_PORT}"
6868
environment:
69-
- CART_SERVICE_PORT
69+
- CART_PORT
7070
- FLAGD_HOST
7171
- VALKEY_ADDR
7272
- OTEL_EXPORTER_OTLP_ENDPOINT
7373
- OTEL_RESOURCE_ATTRIBUTES
74-
- OTEL_SERVICE_NAME=cartservice
75-
- ASPNETCORE_URLS=http://*:${CART_SERVICE_PORT}
74+
- OTEL_SERVICE_NAME=cart
75+
- ASPNETCORE_URLS=http://*:${CART_PORT}
7676
depends_on:
7777
valkey-cart:
7878
condition: service_started
@@ -98,7 +98,7 @@ services:
9898
- "${CHECKOUT_SERVICE_PORT}"
9999
environment:
100100
- CHECKOUT_SERVICE_PORT
101-
- CART_SERVICE_ADDR
101+
- CART_ADDR
102102
- CURRENCY_SERVICE_ADDR
103103
- EMAIL_SERVICE_ADDR
104104
- FLAGD_HOST
@@ -110,7 +110,7 @@ services:
110110
- OTEL_RESOURCE_ATTRIBUTES
111111
- OTEL_SERVICE_NAME=checkoutservice
112112
depends_on:
113-
cartservice:
113+
cart:
114114
condition: service_started
115115
currencyservice:
116116
condition: service_started
@@ -200,7 +200,7 @@ services:
200200
- PORT=${FRONTEND_PORT}
201201
- FRONTEND_ADDR
202202
- AD_SERVICE_ADDR
203-
- CART_SERVICE_ADDR
203+
- CART_ADDR
204204
- CHECKOUT_SERVICE_ADDR
205205
- CURRENCY_SERVICE_ADDR
206206
- PRODUCT_CATALOG_SERVICE_ADDR
@@ -219,7 +219,7 @@ services:
219219
depends_on:
220220
adservice:
221221
condition: service_started
222-
cartservice:
222+
cart:
223223
condition: service_started
224224
checkoutservice:
225225
condition: service_started

‎docker-compose.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -79,30 +79,30 @@ services:
7979
logging: *logging
8080

8181
# Cart service
82-
cartservice:
83-
image: ${IMAGE_NAME}:${DEMO_VERSION}-cartservice
82+
cart:
83+
image: ${IMAGE_NAME}:${DEMO_VERSION}-cart
8484
container_name: cart-service
8585
build:
8686
context: ./
87-
dockerfile: ${CART_SERVICE_DOCKERFILE}
87+
dockerfile: ${CART_DOCKERFILE}
8888
cache_from:
89-
- ${IMAGE_NAME}:${IMAGE_VERSION}-cartservice
89+
- ${IMAGE_NAME}:${IMAGE_VERSION}-cart
9090
deploy:
9191
resources:
9292
limits:
9393
memory: 160M
9494
restart: unless-stopped
9595
ports:
96-
- "${CART_SERVICE_PORT}"
96+
- "${CART_PORT}"
9797
environment:
98-
- CART_SERVICE_PORT
98+
- CART_PORT
9999
- FLAGD_HOST
100100
- FLAGD_PORT
101101
- VALKEY_ADDR
102102
- OTEL_EXPORTER_OTLP_ENDPOINT
103103
- OTEL_RESOURCE_ATTRIBUTES
104-
- OTEL_SERVICE_NAME=cartservice
105-
- ASPNETCORE_URLS=http://*:${CART_SERVICE_PORT}
104+
- OTEL_SERVICE_NAME=cart
105+
- ASPNETCORE_URLS=http://*:${CART_PORT}
106106
depends_on:
107107
valkey-cart:
108108
condition: service_started
@@ -132,7 +132,7 @@ services:
132132
- FLAGD_HOST
133133
- FLAGD_PORT
134134
- CHECKOUT_SERVICE_PORT
135-
- CART_SERVICE_ADDR
135+
- CART_ADDR
136136
- CURRENCY_SERVICE_ADDR
137137
- EMAIL_SERVICE_ADDR
138138
- PAYMENT_SERVICE_ADDR
@@ -144,7 +144,7 @@ services:
144144
- OTEL_RESOURCE_ATTRIBUTES
145145
- OTEL_SERVICE_NAME=checkoutservice
146146
depends_on:
147-
cartservice:
147+
cart:
148148
condition: service_started
149149
currencyservice:
150150
condition: service_started
@@ -272,7 +272,7 @@ services:
272272
- PORT=${FRONTEND_PORT}
273273
- FRONTEND_ADDR
274274
- AD_SERVICE_ADDR
275-
- CART_SERVICE_ADDR
275+
- CART_ADDR
276276
- CHECKOUT_SERVICE_ADDR
277277
- CURRENCY_SERVICE_ADDR
278278
- PRODUCT_CATALOG_SERVICE_ADDR
@@ -291,7 +291,7 @@ services:
291291
depends_on:
292292
adservice:
293293
condition: service_started
294-
cartservice:
294+
cart:
295295
condition: service_started
296296
checkoutservice:
297297
condition: service_started

‎ide-gen-proto.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ gen_proto_ts() {
6767

6868
gen_proto_dotnet accounting
6969
# gen_proto_java adservice
70-
gen_proto_dotnet cartservice
70+
gen_proto_dotnet cart
7171
gen_proto_go checkoutservice
7272
# gen_proto_cpp currencyservice
7373
# gen_proto_ruby emailservice

‎renovate.json5

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"groupName": "adservice",
2424
},
2525
{
26-
"matchFileNames": ["src/cartservice/**"],
27-
"groupName": "cartservice",
26+
"matchFileNames": ["src/cart/**"],
27+
"groupName": "cart",
2828
},
2929
{
3030
"matchFileNames": ["src/checkoutservice/**"],

‎src/cartservice/NuGet.config ‎src/cart/NuGet.config

File renamed without changes.

‎src/cartservice/README.md ‎src/cart/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ Run `dotnet restore` and `dotnet build`.
1111
From the root directory of this repository, run:
1212

1313
```sh
14-
docker compose build cartservice
14+
docker compose build cart
1515
```

‎src/cartservice/cartservice.sln ‎src/cart/cartservice.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26124.0
55
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cartservice", "src\cartservice.csproj", "{2348C29F-E8D3-4955-916D-D609CBC97FCB}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cart", "src\cart.csproj", "{2348C29F-E8D3-4955-916D-D609CBC97FCB}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cartservice.tests", "tests\cartservice.tests.csproj", "{59825342-CE64-4AFA-8744-781692C0811B}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cart.tests", "tests\cart.tests.csproj", "{59825342-CE64-4AFA-8744-781692C0811B}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/cartservice/src/.dockerignore ‎src/cart/src/.dockerignore

File renamed without changes.

‎src/cartservice/src/Dockerfile ‎src/cart/src/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ ARG TARGETARCH
2020

2121
WORKDIR /usr/src/app/
2222

23-
COPY ./src/cartservice/ ./
23+
COPY ./src/cart/ ./
2424
COPY ./pb/ ./pb/
2525

26-
RUN dotnet restore ./src/cartservice.csproj -r linux-musl-$TARGETARCH
26+
RUN dotnet restore ./src/cart.csproj -r linux-musl-$TARGETARCH
2727

28-
RUN dotnet publish ./src/cartservice.csproj -r linux-musl-$TARGETARCH --no-restore -o /cartservice
28+
RUN dotnet publish ./src/cart.csproj -r linux-musl-$TARGETARCH --no-restore -o /cart
2929

3030
# -----------------------------------------------------------------------------
3131

3232
# https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list
3333
FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine3.20
3434

3535
WORKDIR /usr/src/app/
36-
COPY --from=builder /cartservice/ ./
36+
COPY --from=builder /cart/ ./
3737

3838
ENV DOTNET_HOSTBUILDER__RELOADCONFIGONCHANGE=false
3939

40-
EXPOSE ${CART_SERVICE_PORT}
41-
ENTRYPOINT [ "./cartservice" ]
40+
EXPOSE ${CART_PORT}
41+
ENTRYPOINT [ "./cart" ]

‎src/cartservice/src/Program.cs ‎src/cart/src/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// SPDX-License-Identifier: Apache-2.0
33
using System;
44

5-
using cartservice.cartstore;
6-
using cartservice.services;
5+
using cart.cartstore;
6+
using cart.services;
77

88
using Microsoft.AspNetCore.Builder;
99
using Microsoft.AspNetCore.Http;

‎src/cartservice/src/appsettings.json ‎src/cart/src/appsettings.json

File renamed without changes.

‎src/cartservice/src/cartservice.csproj ‎src/cart/src/cart.csproj

File renamed without changes.

‎src/cartservice/src/cartstore/ICartStore.cs ‎src/cart/src/cartstore/ICartStore.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33
using System.Threading.Tasks;
44

5-
namespace cartservice.cartstore;
5+
namespace cart.cartstore;
66

77
public interface ICartStore
88
{

‎src/cartservice/src/cartstore/ValkeyCartStore.cs ‎src/cart/src/cartstore/ValkeyCartStore.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Google.Protobuf;
99
using Microsoft.Extensions.Logging;
1010

11-
namespace cartservice.cartstore;
11+
namespace cart.cartstore;
1212

1313
public class ValkeyCartStore : ICartStore
1414
{

‎src/cartservice/src/services/CartService.cs ‎src/cart/src/services/CartService.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
using System;
66
using Grpc.Core;
77
using OpenTelemetry.Trace;
8-
using cartservice.cartstore;
8+
using cart.cartstore;
99
using OpenFeature;
1010
using Oteldemo;
1111

12-
namespace cartservice.services;
12+
namespace cart.services;
1313

1414
public class CartService : Oteldemo.CartService.CartServiceBase
1515
{
@@ -81,7 +81,7 @@ public override async Task<Empty> EmptyCart(EmptyCartRequest request, ServerCall
8181

8282
try
8383
{
84-
if (await _featureFlagHelper.GetBooleanValueAsync("cartServiceFailure", false))
84+
if (await _featureFlagHelper.GetBooleanValueAsync("cartFailure", false))
8585
{
8686
await _badCartStore.EmptyCartAsync(request.UserId);
8787
}

‎src/cartservice/tests/CartServiceTests.cs ‎src/cart/tests/CartServiceTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using Xunit;
1010
using static Oteldemo.CartService;
1111

12-
namespace cartservice.tests;
12+
namespace cart.tests;
1313

1414
public class CartServiceTests
1515
{

‎src/cartservice/tests/cartservice.tests.csproj ‎src/cart/tests/cart.tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<ProjectReference Include="..\src\cartservice.csproj" />
19+
<ProjectReference Include="..\src\cart.csproj" />
2020
</ItemGroup>
2121
</Project>

‎src/checkoutservice/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func main() {
177177
svc.productCatalogSvcClient = pb.NewProductCatalogServiceClient(c)
178178
defer c.Close()
179179

180-
mustMapEnv(&svc.cartSvcAddr, "CART_SERVICE_ADDR")
180+
mustMapEnv(&svc.cartSvcAddr, "CART_ADDR")
181181
c = mustCreateClient(svc.cartSvcAddr)
182182
svc.cartSvcClient = pb.NewCartServiceClient(c)
183183
defer c.Close()

‎src/flagd/demo.flagd.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
},
5656
"defaultVariant": "off"
5757
},
58-
"cartServiceFailure": {
58+
"cartFailure": {
5959
"description": "Fail cart service",
6060
"state": "ENABLED",
6161
"variants": {

‎src/frontend/gateways/rpc/Cart.gateway.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import { ChannelCredentials } from '@grpc/grpc-js';
55
import { Cart, CartItem, CartServiceClient, Empty } from '../../protos/demo';
66

7-
const { CART_SERVICE_ADDR = '' } = process.env;
7+
const { CART_ADDR = '' } = process.env;
88

9-
const client = new CartServiceClient(CART_SERVICE_ADDR, ChannelCredentials.createInsecure());
9+
const client = new CartServiceClient(CART_ADDR, ChannelCredentials.createInsecure());
1010

1111
const CartGateway = () => ({
1212
getCart(userId: string) {

‎src/frontend/next.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dotenvExpand.expand(myEnv);
1414

1515
const {
1616
AD_SERVICE_ADDR = '',
17-
CART_SERVICE_ADDR = '',
17+
CART_ADDR = '',
1818
CHECKOUT_SERVICE_ADDR = '',
1919
CURRENCY_SERVICE_ADDR = '',
2020
PRODUCT_CATALOG_SERVICE_ADDR = '',
@@ -46,7 +46,7 @@ const nextConfig = {
4646
},
4747
env: {
4848
AD_SERVICE_ADDR,
49-
CART_SERVICE_ADDR,
49+
CART_ADDR,
5050
CHECKOUT_SERVICE_ADDR,
5151
CURRENCY_SERVICE_ADDR,
5252
PRODUCT_CATALOG_SERVICE_ADDR,

0 commit comments

Comments
 (0)