Update content

Author: christosgalano

.github/workflows/ci_cd.yaml

@@ -143,7 +143,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Azure login
-        uses: Azure/login@v1
+        uses: Azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 

.github/workflows/deploy_infra.yaml

@@ -56,10 +56,70 @@ jobs:
           compare_to_earlier_commit: true
           check_run_annotations: all tests, skipped tests
 
-  deploy-infrastructure:
-    name: deploy-infrastructure
+  deploy-development:
+    name: deploy-development
     needs: psrule-scan
     runs-on: ubuntu-latest
+    environment: development-infrastructure
+    permissions:
+      contents: read
+    defaults:
+      run:
+        shell: bash
+        working-directory: ${{ env.BICEP_DIR }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Azure login
+        uses: Azure/login@v2
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      - name: Lint template
+        run: az bicep build --file main.bicep
+
+      - name: Validate template
+        run: |
+          az stack sub validate \
+          --name "${{ vars.DEPLOYMENT_STACK_NAME }}" \
+          --location "${{ vars.LOCATION }}"  \
+          --template-file main.bicep \
+          --parameters @environments/development.bicepparam \
+          --action-on-unmanage 'deleteAll' \
+          --deny-settings-mode 'denyDelete'
+            
+      - name: Deploy template
+        run: |
+          az stack sub create \
+          --name "${{ vars.DEPLOYMENT_STACK_NAME }}" \
+          --location "${{ vars.LOCATION }}"  \
+          --template-file main.bicep \
+          --parameters @environments/development.bicepparam \
+          --action-on-unmanage 'deleteAll' \
+          --deny-settings-mode 'denyDelete' \
+          --yes
+
+  # approve:
+  #   name: approve-promotion
+  #   needs: deploy-development
+  #   runs-on: ubuntu-latest
+  #   permissions:
+  #     issues: write
+  #   steps:
+  #     - name: Manual approval
+  #       uses: trstringer/manual-approval@v1.9.0
+  #       with:
+  #         approvers: christosgalano
+  #         minimum-approvals: 1
+  #         issue-title: "Approve promotion to production"
+  #         secret: ${{ secrets.GITHUB_TOKEN }}
+
+  deploy-production:
+    name: deploy-production
+    # needs: approve
+    needs: deploy-development
+    runs-on: ubuntu-latest
     environment: production-infrastructure
     permissions:
       contents: read
@@ -72,7 +132,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Azure login
-        uses: Azure/login@v1
+        uses: Azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 
@@ -81,16 +141,21 @@ jobs:
 
       - name: Validate template
         run: |
-          az deployment sub validate \
-          --name "${{ vars.DEPLOYMENT_NAME }}" \
-          --location "${{ vars.LOCATION }}" \
-          --template-file azure.deploy.bicep \
-          --parameters azure.deploy.parameters.json
+          az stack sub validate \
+          --name "${{ vars.DEPLOYMENT_STACK_NAME }}" \
+          --location "${{ vars.LOCATION }}"  \
+          --template-file main.bicep \
+          --parameters @environments/production.bicepparam \
+          --action-on-unmanage 'deleteAll' \
+          --deny-settings-mode 'denyDelete'
             
       - name: Deploy template
         run: |
-          az deployment sub create \
-          --name "${{ vars.DEPLOYMENT_NAME }}" \
+          az stack sub create \
+          --name "${{ vars.DEPLOYMENT_STACK_NAME }}" \
           --location "${{ vars.LOCATION }}"  \
-          --template-file azure.deploy.bicep \
-          --parameters azure.deploy.parameters.json
+          --template-file main.bicep \
+          --parameters @environments/production.bicepparam \
+          --action-on-unmanage 'deleteAll' \
+          --deny-settings-mode 'denyDelete' \
+          --yes

.github/workflows/destroy_infra.yaml

@@ -19,4 +19,4 @@ USER fastapi
 
 EXPOSE 8000
 
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

src/Dockerfile

@@ -31,13 +31,13 @@ def get_hello_3(string_1: str, string_2: str, string_3: str):
     return f"Hello {string_1}, {string_2}, {string_3}"
 
 
-@app.get(
-    "/{string_1}/{string_2}/{string_3}/{string_4}",
-    response_model=str,
-    status_code=status.HTTP_200_OK,
-)
-def get_hello_4(string_1: str, string_2: str, string_3: str, string_4: str):
-    return f"Hello {string_1}, {string_2}, {string_3}, {string_4}"
+# @app.get(
+#     "/{string_1}/{string_2}/{string_3}/{string_4}",
+#     response_model=str,
+#     status_code=status.HTTP_200_OK,
+# )
+# def get_hello_4(string_1: str, string_2: str, string_3: str, string_4: str):
+#     return f"Hello {string_1}, {string_2}, {string_3}, {string_4}"
 
 
 if __name__ == "__main__":

src/app/main.py

@@ -29,10 +29,10 @@ def test_get_hello_3():
     assert response.json() == "Hello devops, engineers, again"
 
 
-def test_get_hello_4():
-    response = client.get(url="/devops/engineers/once/more")
-    assert response.status_code == 200
-    assert response.json() == "Hello devops, engineers, once, more"
+# def test_get_hello_4():
+#     response = client.get(url="/devops/engineers/once/more")
+#     assert response.status_code == 200
+#     assert response.json() == "Hello devops, engineers, once, more"
 
 
 def test_not_found():