restructure cli (#656)

.github/workflows/docker-push-main.yml

@@ -9,7 +9,7 @@ on:
       - main
 
 jobs:
-  # Build ARM64 image on native ARM64 runner
+  # Build ARM64 image on native ARM64 runner.
   build-arm64:
     runs-on: [linux-arm64]
     steps:
@@ -34,7 +34,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./arch/Dockerfile
+          file: ./Dockerfile
           platforms: linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}-arm64
@@ -64,7 +64,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./arch/Dockerfile
+          file: ./Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}-amd64

.github/workflows/docker-push-release.yml

@@ -33,7 +33,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./arch/Dockerfile
+          file: ./Dockerfile
           platforms: linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}-arm64
@@ -63,7 +63,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./arch/Dockerfile
+          file: ./Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}-amd64

.github/workflows/e2e_archgw.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: build arch docker image
         run: |
-          cd ../../ && docker build -f arch/Dockerfile . -t katanemo/plano -t katanemo/plano:0.4.0 -t katanemo/plano:latest
+          cd ../../ && docker build -f Dockerfile . -t katanemo/plano -t katanemo/plano:0.4.0 -t katanemo/plano:latest
 
       - name: start plano
         env:

.github/workflows/e2e_test_currency_convert.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: build plano docker image
         run: |
-          docker build  -f arch/Dockerfile . -t katanemo/plano -t katanemo/plano:0.4.0
+          docker build  -f Dockerfile . -t katanemo/plano -t katanemo/plano:0.4.0
 
       - name: install poetry
         run: |
@@ -43,8 +43,8 @@ jobs:
       - name: install arch gateway and test dependencies
         run: |
           source venv/bin/activate
-          cd arch/tools && echo "installing plano cli" && poetry install
-          cd ../../demos/shared/test_runner && echo "installing test dependencies" && poetry install
+          cd cli && echo "installing plano cli" && poetry install
+          cd ../demos/shared/test_runner && echo "installing test dependencies" && poetry install
 
       - name: run demo tests
         env:

.github/workflows/e2e_test_preference_based_routing.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: build arch docker image
         run: |
-          docker build  -f arch/Dockerfile . -t katanemo/plano -t katanemo/plano:0.4.0
+          docker build  -f Dockerfile . -t katanemo/plano -t katanemo/plano:0.4.0
 
       - name: install poetry
         run: |
@@ -43,8 +43,8 @@ jobs:
       - name: install arch gateway and test dependencies
         run: |
           source venv/bin/activate
-          cd arch/tools && echo "installing plano cli" && poetry install
-          cd ../../demos/shared/test_runner && echo "installing test dependencies" && poetry install
+          cd cli && echo "installing plano cli" && poetry install
+          cd ../demos/shared/test_runner && echo "installing test dependencies" && poetry install
 
       - name: run demo tests
         env:

.github/workflows/ghrc-push-main.yml

@@ -30,7 +30,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./arch/Dockerfile
+          file: ./Dockerfile
           platforms: linux/arm64
           push: true
           # produce ghcr.io/<owner>/plano:latest-arm64
@@ -58,7 +58,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./arch/Dockerfile
+          file: ./Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}-amd64

.github/workflows/ghrc-push-release.yml

@@ -30,7 +30,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./arch/Dockerfile
+          file: ./Dockerfile
           platforms: linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}-arm64
@@ -57,7 +57,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./arch/Dockerfile
+          file: ./Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}-amd64

.github/workflows/plano_tools_tests.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest-m
     defaults:
       run:
-        working-directory: ./arch/tools
+        working-directory: ./cli
 
     steps:
       - name: Checkout code

.github/workflows/validate_arch_config.yml

@@ -24,8 +24,8 @@ jobs:
 
       - name: build arch docker image
         run: |
-          docker build  -f arch/Dockerfile . -t katanemo/plano -t katanemo/plano:0.4.0
+          docker build  -f Dockerfile . -t katanemo/plano -t katanemo/plano:0.4.0
 
       - name: validate arch config
         run: |
-          bash arch/validate_plano_config.sh
+          bash config/validate_plano_config.sh