renaming basket-api into cart-api

chayxana · Jan 21, 2024 · 5c65004 · 5c65004
1 parent fa9ce19
commit 5c65004
Show file tree

Hide file tree

Showing 65 changed files with 102 additions and 128 deletions.
diff --git a/.github/workflows/basket-api.yml → .github/workflows/cart-api.yml b/.github/workflows/basket-api.yml → .github/workflows/cart-api.yml
@@ -1,27 +1,27 @@
 
-name: basket-api
+name: cart-api
 
 on:
   push:
     branches:
     - develop
     paths:
-    - 'src/backend/services/basket-api/**'
-    - '.github/workflows/basket-api.yml'
+    - 'src/backend/services/cart-api/**'
+    - '.github/workflows/cart-api.yml'
 
   pull_request:
     branches:
     - develop
     paths:
-    - 'src/backend/services/basket-api/**'
-    - '.github/workflows/basket-api.yml'
+    - 'src/backend/services/cart-api/**'
+    - '.github/workflows/cart-api.yml'
 
 
 jobs:
   build-release:
     uses: ./.github/workflows/build-release.yml
     with:
-      service-name: basket-api
+      service-name: cart-api
     secrets: inherit
 
   deploy:
@@ -30,6 +30,6 @@ jobs:
       - build-release
     uses: ./.github/workflows/deploy.yml
     with:
-      service-name: basket-api
+      service-name: cart-api
       version: ${{ needs.build-release.outputs.new-version }}
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -70,7 +70,7 @@ jobs:
     - if: matrix.language == 'go'
       name: Build Go
       run: |
-       bash ./src/backend/services/basket-api/build.sh 
+       bash ./src/backend/services/cart-api/build.sh 
 
     - if: matrix.language == 'csharp'
       name: Build C#

diff --git a/k8s-kustomize/services/basket-api/base/deployment.yaml b/k8s-kustomize/services/basket-api/base/deployment.yaml
@@ -1,26 +1,26 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: basket-api
+  name: cart-api
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: basket-api
+      app: cart-api
   template:
     metadata:
       labels:
-        app: basket-api
+        app: cart-api
     spec:
       containers:
-        - image: basket-api # must much from ./kustomization.yaml -> images[0].name
+        - image: cart-api # must much from ./kustomization.yaml -> images[0].name
           imagePullPolicy: IfNotPresent
-          name: basket-api
+          name: cart-api
           ports:
             - containerPort: 5200
           envFrom:
             - configMapKeyRef:
-              name: basket-api
+              name: cart-api
           resources:
             requests:
               memory: "32Mi"

diff --git a/k8s-kustomize/services/basket-api/base/http-route.yaml b/k8s-kustomize/services/basket-api/base/http-route.yaml
@@ -1,7 +1,7 @@
 apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: HTTPRoute
 metadata:
-  name: basket-api
+  name: cart-api
 spec:
   parentRefs:
   - kind: Gateway
@@ -13,5 +13,5 @@ spec:
         type: PathPrefix
         value: /basket
     backendRefs:
-    - name: basket-api
+    - name: cart-api
       port: 80
diff --git a/k8s-kustomize/services/basket-api/base/kustomization.yaml b/k8s-kustomize/services/basket-api/base/kustomization.yaml
@@ -13,9 +13,9 @@ resources:
 configMapGenerator:
 - envs:
   - config.env
-  name: basket-api
+  name: cart-api
 
 images:
-- name: basket-api
-  newName: ghcr.io/chayxana/basket-api
+- name: cart-api
+  newName: ghcr.io/chayxana/cart-api
   newTag: 0.0.27
diff --git a/k8s-kustomize/services/basket-api/base/service.yaml b/k8s-kustomize/services/basket-api/base/service.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: basket-api
+  name: cart-api
 spec:
   type: ClusterIP
   ports:
   - port: 80
     name: http
     targetPort: 5200
   selector:
-    app: basket-api
+    app: cart-api
diff --git a/k8s-kustomize/services/basket-api/dev/kustomization.yaml b/k8s-kustomize/services/basket-api/dev/kustomization.yaml
@@ -7,6 +7,6 @@ configMapGenerator:
 - behavior: merge
   envs:
   - config.env
-  name: basket-api
+  name: cart-api
 resources:
 - ../base
diff --git a/k8s-kustomize/services/order-api/base/config.env b/k8s-kustomize/services/order-api/base/config.env
@@ -1,3 +1,3 @@
-basket.url=http://basket-api
+basket.url=http://cart-api
 datasource.url=jdbc:postgresql://order-pgsql-database:5432/orderdb
 env.var=prod
diff --git a/src/backend/backend.code-workspace b/src/backend/backend.code-workspace
@@ -14,8 +14,8 @@
 			"path": "./services/payment-api"
 		},	
 		{
-			"name": "basket-api",
-			"path": "./services/basket-api"
+			"name": "cart-api",
+			"path": "./services/cart-api"
 		},
 		{
 			"name": "identity-api",

diff --git a/src/backend/docker/docker-compose.elk.yml b/src/backend/docker/docker-compose.elk.yml
@@ -19,14 +19,14 @@ services:
         fluentd-address: localhost:24224
         tag: order-api
 
-  basket-api:
+  cart-api:
     links:
       - fluentd
     logging:
       driver: "fluentd"
       options:
         fluentd-address: localhost:24224
-        tag: basket-api
+        tag: cart-api
 
   catlog-api:
     links:

diff --git a/src/backend/docker/docker-compose.kafka.yml b/src/backend/docker/docker-compose.kafka.yml
@@ -1,7 +1,7 @@
 ---
 version: "3.7"
 services:
-  basket-api:
+  cart-api:
     depends_on:
       kafka:
          condition: service_healthy

diff --git a/src/backend/docker/docker-compose.override.yml b/src/backend/docker/docker-compose.override.yml
@@ -13,7 +13,7 @@ services:
       - QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317
       - QUARKUS_OPENTELEMETRY_PROPAGATORS=ottrace
 
-  basket-api:
+  cart-api:
     environment:
       - REDIS_HOST=redis:6379
       - KAFKA_BROKER=kafka:29092
@@ -32,7 +32,7 @@ services:
     environment:
       - PORT=30001
       - HOST=0.0.0.0
-      - CART_URL=basket-api:8081
+      - CART_URL=cart-api:8081
       - PAYMENT_API_URL=payment-api:8080
       - KAFKA_BROKER=kafka:29092
       - CHECKOUT_TOPIC=checkout
@@ -69,7 +69,7 @@ services:
       - IDENTITY_URL_PUB=http://localhost:8080/identity
 
   # connect: 
-  # pgcli 'postgresql://admin:Passw0rd!@localhost:5435/identity_database'
+  # pgcli 'postgresql://admin:Passw0rd!@localhost:5433/orderdb'
   order-db:
     environment:
       - POSTGRES_PASSWORD=Passw0rd!

diff --git a/src/backend/docker/docker-compose.traefik.yml b/src/backend/docker/docker-compose.traefik.yml
@@ -33,7 +33,7 @@ services:
       - "traefik.http.routers.catalog.rule=PathPrefix(`/catalog/`)"
       - "traefik.port=8000"
 
-  basket-api:
+  cart-api:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.basket.rule=PathPrefix(`/basket/`)"

diff --git a/src/backend/docker/docker-compose.yml b/src/backend/docker/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     image: restaurant/checkout-api
     build: ./services/checkout-api
     depends_on:
-      - basket-api
+      - cart-api
       - payment-api
     ports:
       - 30001:30001
@@ -29,10 +29,10 @@ services:
       - 8000:8000
     restart: always
 
-  basket-api:
-    image: restaurant/basket-api
+  cart-api:
+    image: restaurant/cart-api
     container_name: basket
-    build: ./services/basket-api
+    build: ./services/cart-api
     depends_on:
       - redis
 

diff --git a/src/backend/nginx/nginx.conf b/src/backend/nginx/nginx.conf
@@ -6,8 +6,8 @@ upstream identity-api {
   server identity-api:80;
 }
 
-upstream basket-api {
-  server basket-api:5200;
+upstream cart-api {
+  server cart-api:5200;
 }
 
 upstream order-api {
@@ -51,7 +51,7 @@ server {
   }
 
   location /basket/ {
-    proxy_pass http://basket-api/;
+
   }
 
   location /order {

diff --git a/src/backend/scripts/build.sh b/src/backend/scripts/build.sh
@@ -25,7 +25,7 @@ build_order_api(){
 }
 
 build_basket_api() {
-    cd ./services/basket.api/
+    cd ./services/cart-api/
     echo "#### Building Basket API"
     sh build.sh
     cd -

diff --git a/src/backend/scripts/qa.sh b/src/backend/scripts/qa.sh
@@ -19,7 +19,7 @@ main () {
 }
 
 qa_basket_api() {
-    cd ./services/basket.api
+    cd ./services/cart-api
     sh qa.sh
 }
 

diff --git a/src/backend/services/basket-api/internal/models/checkout.go b/src/backend/services/basket-api/internal/models/checkout.go
diff --git a/src/backend/services/basket-api/internal/models/customer_basket.go b/src/backend/services/basket-api/internal/models/customer_basket.go
diff --git a/src/backend/services/basket-api/release.Dockerfile b/src/backend/services/basket-api/release.Dockerfile
diff --git a/src/backend/services/basket-api/.gitignore → src/backend/services/cart-api/.gitignore b/src/backend/services/basket-api/.gitignore → src/backend/services/cart-api/.gitignore
diff --git a/src/backend/services/basket-api/Dockerfile → src/backend/services/cart-api/Dockerfile b/src/backend/services/basket-api/Dockerfile → src/backend/services/cart-api/Dockerfile
@@ -13,15 +13,15 @@ RUN go mod download
 
 COPY ./ ./
 
-RUN CGO_ENABLED=0 go build -installsuffix 'static' -o basket-api cmd/api/main.go 
+RUN CGO_ENABLED=0 go build -installsuffix 'static' -o cart-api cmd/api/main.go 
 RUN CGO_ENABLED=0 go test -c ./internal/handlers -o handlers.test -cover
 
 #final stage
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates
 
 COPY --from=builder /src ./
-CMD ["./basket-api"] 
-LABEL Name=basket.api Version=0.0.1
+CMD ["./cart-api"] 
+LABEL Name=cart-api Version=0.0.1
 EXPOSE 5200
 ENV PORT 5200
diff --git a/src/backend/services/basket-api/README.md → src/backend/services/cart-api/README.md b/src/backend/services/basket-api/README.md → src/backend/services/cart-api/README.md
diff --git a/src/backend/services/basket-api/build.sh → src/backend/services/cart-api/build.sh b/src/backend/services/basket-api/build.sh → src/backend/services/cart-api/build.sh