s3 improvements

kevingrismore · Mar 5, 2024 · 3b95165 · 3b95165
1 parent a9efb9a
commit 3b95165
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/project-1-deploy.yaml b/.github/workflows/project-1-deploy.yaml
@@ -17,6 +17,8 @@ jobs:
     name: Deploy to staging
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/stg'
+    env:
+        ENVIRONMENT: stg
 
     steps:
       - name: Checkout
@@ -66,6 +68,8 @@ jobs:
       name: Deploy to production
       runs-on: ubuntu-latest
       if: github.ref == 'refs/heads/main'
+      env:
+        ENVIRONMENT: prod
 
       steps:
         - name: Checkout
@@ -107,6 +111,7 @@ jobs:
             PREFECT_API_KEY: ${{ secrets.PREFECT_API_KEY }}
             IMAGE_NAME: ${{ steps.build-docker-image.outputs.metadata.image.name }}
           run: |
-            pip install -r $PROJECT_NAME/requirements.txt
+            cd $PROJECT_NAME
+            pip install -r requirements.txt
             prefect cloud workspace set -w sales-engineering/sandbox-kevin
-            prefect deploy --all --prefect-file $PROJECT_NAME/prefect.yaml
+            prefect deploy --all --prefect-file prefect.yaml
diff --git a/.github/workflows/project-2-deploy.yaml b/.github/workflows/project-2-deploy.yaml
@@ -17,6 +17,8 @@ jobs:
     name: Deploy to staging
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/stg'
+    env:
+      ENVIRONMENT: stg
 
     steps:
       - name: Checkout
@@ -66,6 +68,8 @@ jobs:
       name: Deploy to production
       runs-on: ubuntu-latest
       if: github.ref == 'refs/heads/main'
+      env:
+        ENVIRONMENT: prod
 
       steps:
         - name: Checkout
@@ -107,6 +111,7 @@ jobs:
             PREFECT_API_KEY: ${{ secrets.PREFECT_API_KEY }}
             IMAGE_NAME: ${{ steps.build-docker-image.outputs.metadata.image.name }}
           run: |
-            pip install -r $PROJECT_NAME/requirements.txt
+            cd $PROJECT_NAME
+            pip install -r requirements.txt
             prefect cloud workspace set -w sales-engineering/sandbox-kevin
-            prefect deploy --all --prefect-file $PROJECT_NAME/prefect.yaml
+            prefect deploy --all --prefect-file prefect.yaml
diff --git a/project_1/prefect.yaml b/project_1/prefect.yaml
@@ -7,19 +7,19 @@ push:
   - prefect_aws.deployments.steps.push_to_s3:
       requires: prefect-aws
       bucket: cicd-example-workspaces
-      folder: "{{ $PROJECT_NAME }}"
+      folder: "{{ $PROJECT_NAME }}_{{ $ENVIRONMENT }}"
       credentials: "{{ prefect.blocks.aws-credentials.ecs-worker-changes }}"
 
 pull:
   - prefect_aws.deployments.steps.pull_from_s3:
       requires: prefect-aws
       bucket: cicd-example-workspaces
-      folder: "{{ $PROJECT_NAME }}"
+      folder: "{{ $PROJECT_NAME }}_{{ $ENVIRONMENT }}"
       credentials: "{{ prefect.blocks.aws-credentials.ecs-worker-changes }}"
 
 deployments:
   - name: my-project-1-deployment
-    entrypoint: "{{ $PROJECT_NAME }}/flow.py:hello"
+    entrypoint: "{{ $PROJECT_NAME }}_{{ $ENVIRONMENT}}/flow.py:hello"
     work_pool:
       name: k8s-demo
       work_queue_name: default

diff --git a/project_2/prefect.yaml b/project_2/prefect.yaml
@@ -7,19 +7,19 @@ push:
   - prefect_aws.deployments.steps.push_to_s3:
       requires: prefect-aws
       bucket: cicd-example-workspaces
-      folder: "{{ $PROJECT_NAME }}"
+      folder: "{{ $PROJECT_NAME }}_{{ $ENVIRONMENT }}"
       credentials: "{{ prefect.blocks.aws-credentials.ecs-worker-changes }}"
 
 pull:
   - prefect_aws.deployments.steps.pull_from_s3:
       requires: prefect-aws
       bucket: cicd-example-workspaces
-      folder: "{{ $PROJECT_NAME }}"
+      folder: "{{ $PROJECT_NAME }}_{{ $ENVIRONMENT }}"
       credentials: "{{ prefect.blocks.aws-credentials.ecs-worker-changes }}"
 
 deployments:
   - name: my-project-2-deployment
-    entrypoint: "{{ $PROJECT_NAME }}/flow.py:hello"
+    entrypoint: "{{ $PROJECT_NAME }}_{{ $ENVIRONMENT}}/flow.py:hello"
     work_pool:
       name: k8s-demo
       work_queue_name: default