Merge pull request #11 from seifrajhi/AWS-Containers-Retail-Sample-v2

fix AWS Containers Retail Sample
seifrajhi · Jan 25, 2024 · c0f0b56 · c0f0b56
2 parents f0409a6 + 6274c4b
commit c0f0b56
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 48 deletions.
diff --git a/...l-store-sample-app/.github/dependabot.yml → .github/dependabot.yml b/...l-store-sample-app/.github/dependabot.yml → .github/dependabot.yml
@@ -1,49 +1,49 @@
 version: 2
 updates:
   - package-ecosystem: "maven"
-    directory: "/src/cart"
+    directory: "retail-store-sample-app/src/cart"
     schedule:
       interval: "monthly"
     commit-message:
       prefix: "chore"
       include: "scope"
   - package-ecosystem: "maven"
-    directory: "/src/orders"
+    directory: "retail-store-sample-app/src/orders"
     schedule:
       interval: "monthly"
     commit-message:
       prefix: "chore"
       include: "scope"
   - package-ecosystem: "maven"
-    directory: "/src/ui"
+    directory: "retail-store-sample-app/src/ui"
     schedule:
       interval: "monthly"
     commit-message:
       prefix: "chore"
       include: "scope"
   - package-ecosystem: "npm"
-    directory: "/src/checkout"
+    directory: "retail-store-sample-app/src/checkout"
     schedule:
       interval: "monthly"
     commit-message:
       prefix: "chore"
       include: "scope"
   - package-ecosystem: "gomod"
-    directory: "/src/catalog"
+    directory: "retail-store-sample-app/src/catalog"
     schedule:
       interval: "monthly"
     commit-message:
       prefix: "chore"
       include: "scope"
   - package-ecosystem: "npm"
-    directory: "/src/e2e"
+    directory: "retail-store-sample-app/src/e2e"
     schedule:
       interval: "monthly"
     commit-message:
       prefix: "chore"
       include: "scope"
   - package-ecosystem: "npm"
-    directory: "/src/load-generator"
+    directory: "retail-store-sample-app/src/load-generator"
     schedule:
       interval: "monthly"
     commit-message:

diff --git a/...ample-app/.github/workflows/ci-assets.yml → .github/workflows/ci-assets.yml b/...ample-app/.github/workflows/ci-assets.yml → .github/workflows/ci-assets.yml
@@ -5,13 +5,13 @@ on:
     branches:
     - main
     paths:
-    - 'src/assets/**'
+    - 'retail-store-sample-app/src/assets/**'
   pull_request:
     branches:
     - main
     paths:
-    - 'src/assets/**'
-    - 'images/**'
+    - 'retail-store-sample-app/src/assets/**'
+    - 'retail-store-sample-app/images/**'
   workflow_dispatch:
 
 jobs:
@@ -38,4 +38,4 @@ jobs:
 
     - name: Build container image
       run: |
-        scripts/build-image.sh -s assets -t ci --actions-cache
+        retail-store-sample-app/scripts/build-image.sh -s assets -t ci --actions-cache
diff --git a/...-sample-app/.github/workflows/ci-cart.yml → .github/workflows/ci-cart.yml b/...-sample-app/.github/workflows/ci-cart.yml → .github/workflows/ci-cart.yml
@@ -5,13 +5,13 @@ on:
     branches:
     - main
     paths:
-    - 'src/cart/**'
+    - 'retail-store-sample-app/src/cart/**'
   pull_request:
     branches:
     - main
     paths:
-    - 'src/cart/**'
-    - 'images/**'
+    - 'retail-store-sample-app/src/cart/**'
+    - 'retail-store-sample-app/images/**'
   workflow_dispatch:
 
 jobs:
@@ -32,7 +32,7 @@ jobs:
       env:
         MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
       run: |
-        src/cart/scripts/ci.sh
+        src/cart/retail-store-sample-app/scripts/ci.sh
 
     - name: Set up QEMU
       id: qemu
@@ -50,4 +50,4 @@ jobs:
 
     - name: Build container image
       run: |
-        scripts/build-image.sh -s cart -t ci --actions-cache
+        retail-store-sample-app/scripts/build-image.sh -s cart -t ci --actions-cache
diff --git a/...mple-app/.github/workflows/ci-catalog.yml → .github/workflows/ci-catalog.yml b/...mple-app/.github/workflows/ci-catalog.yml → .github/workflows/ci-catalog.yml
@@ -5,13 +5,13 @@ on:
     branches:
     - main
     paths:
-    - 'src/catalog/**'
+    - 'retail-store-sample-app/src/catalog/**'
   pull_request:
     branches:
     - main
     paths:
-    - 'src/catalog/**'
-    - 'images/**'
+    - 'retail-store-sample-app/src/catalog/**'
+    - 'retail-store-sample-app/images/**'
   workflow_dispatch:
 
 jobs:
@@ -28,7 +28,7 @@ jobs:
 
     - name: Run CI script
       run: |
-        src/catalog/scripts/ci.sh
+        src/catalog/retail-store-sample-app/scripts/ci.sh
 
     - name: Set up QEMU
       id: qemu
@@ -46,4 +46,4 @@ jobs:
 
     - name: Build container image
       run: |
-        scripts/build-image.sh -s catalog -t ci --actions-cache
+        retail-store-sample-app/scripts/build-image.sh -s catalog -t ci --actions-cache
diff --git a/...ple-app/.github/workflows/ci-checkout.yml → .github/workflows/ci-checkout.yml b/...ple-app/.github/workflows/ci-checkout.yml → .github/workflows/ci-checkout.yml
@@ -5,13 +5,13 @@ on:
     branches:
     - main
     paths:
-    - 'src/checkout/**'
+    - 'retail-store-sample-app/src/checkout/**'
   pull_request:
     branches:
     - main
     paths:
-    - 'src/checkout/**'
-    - 'images/**'
+    - 'retail-store-sample-app/src/checkout/**'
+    - 'retail-store-sample-app/images/**'
   workflow_dispatch:
 
 jobs:
@@ -29,7 +29,7 @@ jobs:
 
     - name: Run CI script
       run: |
-        bash src/checkout/scripts/ci.sh
+        bash src/checkout/retail-store-sample-app/scripts/ci.sh
 
     - name: Set up QEMU
       id: qemu
@@ -47,4 +47,4 @@ jobs:
 
     - name: Build container image
       run: |
-        scripts/build-image.sh -s checkout -t ci --actions-cache
+        retail-store-sample-app/scripts/build-image.sh -s checkout -t ci --actions-cache
diff --git a/...ample-app/.github/workflows/ci-orders.yml → .github/workflows/ci-orders.yml b/...ample-app/.github/workflows/ci-orders.yml → .github/workflows/ci-orders.yml
@@ -5,13 +5,13 @@ on:
     branches:
     - main
     paths:
-    - 'src/orders/**'
+    - 'retail-store-sample-app/src/orders/**'
   pull_request:
     branches:
     - main
     paths:
-    - 'src/orders/**'
-    - 'images/**'
+    - 'retail-store-sample-app/src/orders/**'
+    - 'retail-store-sample-app/images/**'
   workflow_dispatch:
 
 jobs:
@@ -32,7 +32,7 @@ jobs:
       env:
         MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
       run: |
-        src/orders/scripts/ci.sh
+        src/orders/retail-store-sample-app/scripts/ci.sh
 
     - name: Set up QEMU
       id: qemu
@@ -50,4 +50,4 @@ jobs:
 
     - name: Build container image
       run: |
-        scripts/build-image.sh -s orders -t ci --actions-cache
+        retail-store-sample-app/scripts/build-image.sh -s orders -t ci --actions-cache
diff --git a/...re-sample-app/.github/workflows/ci-ui.yml → .github/workflows/ci-ui.yml b/...re-sample-app/.github/workflows/ci-ui.yml → .github/workflows/ci-ui.yml
@@ -5,13 +5,13 @@ on:
     branches:
     - main
     paths:
-    - 'src/ui/**'
+    - 'retail-store-sample-app/src/ui/**'
   pull_request:
     branches:
     - main
     paths:
-    - 'src/ui/**'
-    - 'images/**'
+    - 'retail-store-sample-app/src/ui/**'
+    - 'retail-store-sample-app/images/**'
   workflow_dispatch:
 
 jobs:
@@ -32,7 +32,7 @@ jobs:
       env:
         MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
       run: |
-        src/ui/scripts/ci.sh
+        src/ui/retail-store-sample-app/scripts/ci.sh
 
     - name: Set up QEMU
       id: qemu
@@ -50,4 +50,4 @@ jobs:
 
     - name: Build container image
       run: |
-        scripts/build-image.sh -s ui -t ci --actions-cache
+        retail-store-sample-app/scripts/build-image.sh -s ui -t ci --actions-cache
diff --git a/...sample-app/.github/workflows/e2e-test.yml → .github/workflows/e2e-test.yml b/...sample-app/.github/workflows/e2e-test.yml → .github/workflows/e2e-test.yml
@@ -33,13 +33,13 @@ jobs:
 
     - name: Build Images
       run: |
-        scripts/build-image.sh -t e2e
+        retail-store-sample-app/scripts/build-image.sh -t e2e
         
     - name: Run Tests
       run: |
-        (cd deploy/docker-compose && TAG=e2e MYSQL_PASSWORD='test123' docker-compose up -d)
-        (bash scripts/e2e-compose.sh)
-        (cd deploy/docker-compose && docker-compose down)
+        (cd retail-store-sample-app/deploy/docker-compose && TAG=e2e MYSQL_PASSWORD='test123' docker-compose up -d)
+        (bash retail-store-sample-app/scripts/e2e-compose.sh)
+        (cd retail-store-sample-app/deploy/docker-compose && docker-compose down)
 
   kubernetes:
     name: Kubernetes E2E Tests
@@ -61,7 +61,7 @@ jobs:
 
     - name: Build Images
       run: |
-        scripts/build-image.sh -r 'public.ecr.aws/aws-containers' -t e2e
+        retail-store-sample-app/scripts/build-image.sh -r 'public.ecr.aws/aws-containers' -t e2e
 
     - name: Setup helmfile
       uses: mamezou-tech/[email protected]
@@ -83,7 +83,7 @@ jobs:
         kind load docker-image public.ecr.aws/aws-containers/retail-store-sample-orders:$IMAGE_TAG
         kind load docker-image public.ecr.aws/aws-containers/retail-store-sample-ui:$IMAGE_TAG
 
-        (cd deploy/kubernetes/charts && helmfile apply --wait)
+        (cd retail-store-sample-app/deploy/kubernetes/charts && helmfile apply --wait)
         
         sleep 60
 
@@ -106,4 +106,4 @@ jobs:
 
     - name: Test
       run: |
-        bash scripts/e2e-kind.sh
+        bash retail-store-sample-app/scripts/e2e-kind.sh
diff --git a/...sample-app/.github/workflows/lint-pr.yaml → .github/workflows/lint-pr.yaml b/...sample-app/.github/workflows/lint-pr.yaml → .github/workflows/lint-pr.yaml
diff --git a/...tore-sample-app/.github/workflows/oss.yml → .github/workflows/oss.yml b/...tore-sample-app/.github/workflows/oss.yml → .github/workflows/oss.yml
@@ -30,11 +30,11 @@ jobs:
 
           go install github.com/google/[email protected]
           
-          (cd oss/attribution && pip3 install -r requirements.txt)
+          (cd retail-store-sample-app/oss/attribution && pip3 install -r requirements.txt)
 
       - name: Run
         run: |
-          bash oss/run.sh
+          bash retail-store-sample-app/oss/run.sh
           
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4

diff --git a/...e-app/.github/workflows/publish-build.yml → .github/workflows/publish-build.yml b/...e-app/.github/workflows/publish-build.yml → .github/workflows/publish-build.yml
@@ -34,7 +34,7 @@ jobs:
       run: |
         sudo apt-get install -y gettext
         
-        bash scripts/patch-image-tag.sh
+        bash retail-store-sample-app/scripts/patch-image-tag.sh
         
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
@@ -69,7 +69,7 @@ jobs:
         TAG: "${{ github.event.inputs.tag }}"
       run: |
         # Build first to ensure all images create successfully
-        scripts/build-image.sh -r 'public.ecr.aws/aws-containers' -t $TAG --multi-arch --actions-cache
+        retail-store-sample-app/scripts/build-image.sh -r 'public.ecr.aws/aws-containers' -t $TAG --multi-arch --actions-cache
 
     - name: Get AWS credentials
       uses: aws-actions/configure-aws-credentials@v1
@@ -89,7 +89,7 @@ jobs:
         TAG: "${{ github.event.inputs.tag }}"
       run: |
         # Push all images
-        scripts/build-image.sh -r 'public.ecr.aws/aws-containers' -t $TAG --multi-arch --actions-cache -p
+        retail-store-sample-app/scripts/build-image.sh -r 'public.ecr.aws/aws-containers' -t $TAG --multi-arch --actions-cache -p
 
   release:
     name: Release