Merge pull request 'switching terraform backend to azure storage' (#147) from 146-switch-terraform-backend into main

Reviewed-on: #147

.gitea/workflows/build_and_test.yaml

@@ -15,12 +15,22 @@ jobs:
     environment: ${{ inputs.environment_name }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           sparse-checkout: |
             api
             client
 
+      - name: Get Secrets from Infisical
+        uses: Infisical/secrets-action@v1.0.16
+        with:
+          domain: ${{ secrets.INFISICAL_DOMAIN }}
+          client-id: ${{ secrets.INFISICAL_CLIENT_ID }}
+          client-secret: ${{ secrets.INFISICAL_CLIENT_SECRET }}
+          project-slug: ${{ secrets.INFISICAL_PROJECT_SLUG }}
+          env-slug: ${{ inputs.environment_name }}
+          secret-path: /flying
+
       - name: Install Nest CLI
         run: |
           npm install -g @nestjs/cli
@@ -28,7 +38,7 @@ jobs:
       - name: 'Setup Node'
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ vars.NODE_VERSION }}
+          node-version: ${{ env.NODE_VERSION }}
 
       - name: Install dependencies
         run: |
@@ -44,21 +54,20 @@ jobs:
 
       - name: Build Client
         env:
-          VITE_API_URL: ${{ vars.VITE_API_URL }}
+          VITE_API_URL: ${{ env.VITE_API_URL }}
-          VITE_BASE_URL: ${{ vars.VITE_BASE_URL }}
+          VITE_BASE_URL: ${{ env.VITE_BASE_URL }}
-          VITE_CLIENT_ID: ${{ vars.VITE_CLIENT_ID }}
+          VITE_CLIENT_ID: ${{ env.VITE_CLIENT_ID }}
-          VITE_ISSUER_URI: ${{ vars.VITE_ISSUER_URI }}
+          VITE_ISSUER_URI: ${{ env.VITE_ISSUER_URI }}
-          VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
+          VITE_TENANT_ID: ${{ env.VITE_TENANT_ID }}
         run: |
-          printenv
           npm run build -w client
 
       - name: Log into Docker Hub
         if: ${{ github.event_name != 'pull_request' }}
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
+          username: ${{ env.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          password: ${{ env.DOCKERHUB_TOKEN }}
 
       - name: Setup Docker Buildx
         if: ${{ github.event_name != 'pull_request' }}

.gitea/workflows/changes.yaml

@@ -7,6 +7,9 @@ on:
       client:
         value: ${{ jobs.changes.outputs.client }}
 
+permissions:
+  contents: read
+
 jobs:
   changes:
     name: filter
@@ -15,7 +18,13 @@ jobs:
       api: ${{ steps.filter.outputs.api }}
       client: ${{ steps.filter.outputs.client }}
     steps:
-      - uses: actions/checkout@v3
+      - name: 'Setup Node'
+        uses: actions/setup-node@v6
+        with:
+          node-version: '22.x'
+
+      - name: Checkout
+        uses: actions/checkout@v4
       
       - uses: dorny/paths-filter@v3
         id: filter
@@ -25,3 +34,5 @@ jobs:
               - 'api/**'
             client:
               - 'client/**'
+            infrastructure:
+              - 'infrastructure/**'

.gitea/workflows/deploy.yaml

@@ -0,0 +1,44 @@
+name: Deploy
+on:
+  workflow_call:
+    inputs:
+      app_name:
+        required: true
+        type: string
+      environment_name:
+        required: true
+        type: string
+      version_number:
+        required: true
+        type: string
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment: ${{ inputs.environment_name }}
+    steps:
+      - name: Get Secrets from Infisical
+        uses: Infisical/secrets-action@v1.0.16
+        with:
+          domain: ${{ secrets.INFISICAL_DOMAIN }}
+          client-id: ${{ secrets.INFISICAL_CLIENT_ID }}
+          client-secret: ${{ secrets.INFISICAL_CLIENT_SECRET }}
+          project-slug: ${{ secrets.INFISICAL_PROJECT_SLUG }}
+          env-slug: ${{ inputs.environment_name }}
+          secret-path: /flying
+
+      - name: Install Azure CLI
+        run: |
+          curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
+
+      - name: Log in to Azure
+        run: |
+          az login --service-principal --username ${{ env.AZURE_CLIENT_ID }} --password ${{ env.AZURE_CLIENT_SECRET }} --tenant ${{ env.AZURE_TENANT_ID }}
+
+      - name: Update Container App
+        run: |
+          az containerapp update --name ${{ inputs.app_name }}-${{ inputs.environment_name }} --container-name ${{ inputs.app_name }} --resource-group ${{ env.RESOURCE_GROUP }} --image docker.io/noahspan/${{ inputs.app_name }}:${{ inputs.version_number }}

.gitea/workflows/main.yaml

@@ -6,14 +6,14 @@ on:
 
 jobs:
   changes:
-    uses: ./.github/workflows/changes.yaml
+    uses: ./.gitea/workflows/changes.yaml
 
-  build:
+  build-and-test:
     if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true' }}
-    name: build
+    name: build-and-test
     needs:
       - changes
-    uses: ./.github/workflows/build_and_test.yaml
+    uses: ./.gitea/workflows/build_and_test.yaml
     with:
       environment_name: test
       version_number: ${{ github.run_id }}
@@ -23,8 +23,8 @@ jobs:
     name: deploy
     needs: 
       - changes
-      - build
+      - build-and-test
-    uses: ./.github/workflows/deploy.yaml
+    uses: ./.gitea/workflows/deploy.yaml
     with:
       app_name: flying
       environment_name: test

.gitea/workflows/pull_request.yaml

@@ -0,0 +1,19 @@
+name: Pull Request
+
+on:
+  pull_request:
+
+jobs:
+  changes:
+    uses: ./.gitea/workflows/changes.yaml
+
+  build:
+    if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true'}}
+    name: build-and-test
+    needs:
+      - changes
+    uses: ./.gitea/workflows/build_and_test.yaml
+    with:
+      environment_name: test
+      version_number: ${{ github.run_id }}
+    secrets: inherit

.gitea/workflows/tag.yaml

@@ -5,9 +5,9 @@ on:
       - '**'
 
 jobs:
-  build:
+  build-and-test:
-    name: build
+    name: build-and-test
-    uses: ./.github/workflows/build_and_test.yaml
+    uses: ./.gitea/workflows/build_and_test.yaml
     with:
       environment_name: prod
       version_number: ${{ github.ref_name }}
@@ -16,8 +16,8 @@ jobs:
   deploy:
     name: deploy
     needs: 
-      - build
+      - build-and-test
-    uses: ./.github/workflows/deploy.yaml
+    uses: ./.gitea/workflows/deploy.yaml
     with:
       app_name: flying
       environment_name: prod

.gitea/workflows/terraform.yaml

@@ -0,0 +1,44 @@
+name: 'Terraform'
+on:
+  workflow_dispatch:
+    inputs:
+      environment_name:
+        type: string
+
+jobs:
+  terraform:
+    runs-on: ubuntu-latest
+    environment:
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            infrastructure
+
+      - name: Get Secrets from Infisical
+        uses: Infisical/secrets-action@v1.0.16
+        with:
+          domain: ${{ secrets.INFISICAL_DOMAIN }}
+          client-id: ${{ secrets.INFISICAL_CLIENT_ID }}
+          client-secret: ${{ secrets.INFISICAL_CLIENT_SECRET }}
+          project-slug: ${{ secrets.INFISICAL_PROJECT_SLUG }}
+          env-slug: ${{ inputs.environment_name }}
+          secret-path: /flying/terraform
+
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v4
+
+      - name: Terraform init
+        run: |
+          terraform -chdir=./infrastructure init -reconfigure -backend-config="./backend/${{ inputs.environment_name }}.backend.tfvars" -input=false
+
+      - name: Terraform plan
+        run: |
+          terraform -chdir=./infrastructure plan -no-color -input=false
+
+      # - name: Terraform apply
+      #   if: ${{ github.event_name != 'pull_request' }}
+      #   run: |
+      #     terraform -chdir=./infrastructure apply -no-color -input=false
+          

.github/workflows/deploy.yaml

@@ -1,35 +0,0 @@
-name: Deploy
-on:
-  workflow_call:
-    inputs:
-      app_name:
-        required: true
-        type: string
-      environment_name:
-        required: true
-        type: string
-      version_number:
-        required: true
-        type: string
-
-permissions:
-  id-token: write
-  contents: read
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    environment: ${{ inputs.environment_name }}
-    steps:
-      - name: Log in to Azure
-        uses: azure/login@v2
-        with:
-          client-id: ${{ vars.AZURE_CLIENT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant-id: ${{ vars.AZURE_TENANT_ID }}
-
-      - name: Azure CLI script
-        uses: azure/cli@v2
-        with:
-          azcliversion: latest
-          inlineScript: |
-            az containerapp update --name ${{ inputs.app_name }}-${{ inputs.environment_name }} --container-name ${{ inputs.app_name }} --resource-group noahspan --image docker.io/noahspan/${{ inputs.app_name }}:${{ inputs.version_number }}

.github/workflows/pull_request.yaml

@@ -1,19 +0,0 @@
-name: Pull Request
-
-on:
-  pull_request:
-
-jobs:
-  changes:
-    uses: ./.github/workflows/changes.yaml
-
-  build:
-    if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.client == 'true'}}
-    name: build
-    needs:
-      - changes
-    uses: ./.github/workflows/build_and_test.yaml
-    with:
-      environment_name: pull_request
-      version_number: ${{ github.run_id }}
-    secrets: inherit

README.md

@@ -1,3 +1,23 @@
-# Flying (React and NestJS)
+# Flying
 
-A pilot logbook app
+A web app for tracking pilot flight hours and sharing flight tracks.
+
+## Built With
+
+## Getting Started
+
+### Prerequisites
+
+### Installation
+
+## Usage
+
+## Roadmap
+
+- [ ] Expense tracking for plane rental, instructor fees, and fuel rates
+- [ ] Export logbook to CSV
+- [ ] 
+
+## License
+
+## Contact

api/README.md

@@ -1,3 +1,4 @@
 # Flying API
 
 An API for the Flying app.
+...

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "2.1.0",
+  "version": "2.1.5",
   "description": "",
   "author": "",
   "private": true,

api/src/log/log.interceptor.ts

@@ -40,7 +40,7 @@ export class LogInterceptor implements NestInterceptor {
 
           if (jwtPayload[rolesKeyName].includes('Flying.Read')) {
             if (data.entities) {
-              const logs = data.entities.map((entity) => limitData(data.entities));
+              const logs = data.entities.map((entity) => limitData(entity));
 
               return {
                 entities: logs,
@@ -62,8 +62,8 @@ export class LogInterceptor implements NestInterceptor {
             const logs = publicData.slice(0, 5)
 
             return {
-              entities: publicData,
+              entities: logs,
-              total: data.total,
+              total: logs.length,
               hasNextPage: false
             };
           } else {
@@ -71,7 +71,6 @@ export class LogInterceptor implements NestInterceptor {
 
             return publicData
           }
-          
         }
       })
     );

api/src/log/log.service.spec.ts

@@ -19,6 +19,8 @@ describe('LogService', () => {
     createQueryBuilder: jest.fn().mockReturnThis(),
     innerJoinAndSelect: jest.fn().mockReturnThis(),
     orderBy: jest.fn().mockReturnThis(),
+    skip: jest.fn().mockReturnThis(),
+    take: jest.fn().mockReturnThis(),
     getManyAndCount: jest.fn()
   }
 
@@ -232,14 +234,14 @@ describe('LogService', () => {
     const count = 1
     const morePages = false
     
-    jest.spyOn(mockLogRepository, 'findAndCount').mockReturnValue([logs, count, morePages]);
+    jest.spyOn(mockQueryBuilder, 'getManyAndCount').mockReturnValue([logs, count, morePages]);
 
     const {entities, total, hasNextPage} = await service.findLogsWithCount();
 
     expect(entities).toEqual(logs);
     expect(count).toEqual(total);
     expect(hasNextPage).toEqual(morePages);
-    expect(mockLogRepository.findAndCount).toHaveBeenCalled();
+    expect(mockQueryBuilder.getManyAndCount).toHaveBeenCalled();
   })
 
     it('findLogsWithTracks => should find log entries with tracks', async () => {
@@ -292,7 +294,7 @@ describe('LogService', () => {
     expect(entities).toEqual(logs);
     expect(count).toEqual(total);
     expect(hasNextPage).toEqual(morePages);
-    expect(mockLogRepository.findAndCount).toHaveBeenCalled();
+    expect(mockQueryBuilder.getManyAndCount).toHaveBeenCalled();
   })
 
   it('update => should update a log entry', async () => {

api/src/log/log.service.ts

@@ -25,11 +25,22 @@ export class LogService {
   }
 
   async findLogsWithCount(skip?: number, take?: number): Promise<Logs> {
-    const [entities, total] = await this.logRepository.findAndCount({ 
+    // const [entities, total] = await this.logRepository.findAndCount({ 
-      take, 
+    //   take, 
-      skip,
+    //   skip,
-      relations: ['pilot', 'tracks']
+    //   order: {
-    })
+    //     date: 'DESC'
+    //   },
+    //   relations: ['pilot', 'tracks']
+    // })
+
+    const [entities, total] = await this.logRepository
+      .createQueryBuilder('logs')
+      .innerJoinAndSelect('logs.pilot', 'pilot')
+      .orderBy('logs.date', 'DESC')
+      .skip(skip)
+      .take(take)
+      .getManyAndCount()
 
     return {
       entities,
@@ -43,7 +54,9 @@ export class LogService {
       .createQueryBuilder('logs')
       .innerJoinAndSelect('logs.tracks', 'track')
       .innerJoinAndSelect('logs.pilot', 'pilot')
-      .orderBy('date')
+      .orderBy('logs.date', 'DESC')
+      .skip(skip)
+      .take(take)
       .getManyAndCount();
 
     return {

client/README.md

@@ -0,0 +1 @@
+...

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "2.1.0",
+  "version": "2.1.5",
   "type": "module",
   "scripts": {
     "dev": "vite",

client/src/components/logbook/Logbook.tsx

@@ -380,13 +380,13 @@ const Logbook: React.FC<unknown> = () => {
     setPageIndex
   } = table;
 
-  const getLogbookEntries = async (pageIndex?: number, pageSize?: number) => {
+  const getLogbookEntries = async (pageIndex: number, pageSize: number) => {
     try {
       dispatch({ type: 'SET_IS_LOADING', payload: true });
 
       const response: AxiosResponse = await httpClient.get(`api/logs`, {
         params: {
-          skip: pageIndex,
+          skip: pageIndex * pageSize,
           take: pageSize
         }
       });
@@ -413,7 +413,7 @@ const Logbook: React.FC<unknown> = () => {
         setColumnVisibility(columnVisibility)
         dispatch({ type: 'SET_ENTRIES', payload: { entries: entries, totalEntries: response.data.total }});
 
-        if (!isUserLoggedIn && response.data.length >= 5) {
+        if (!isUserLoggedIn && response.data.entities.length >= 5) {
           dispatch({ type: 'SET_ALERT', payload: { severity: 'info', message: 'A limited number of log entries displayed. Sign in to view all log entries.'}})
         } else {
           dispatch({ type: 'SET_ALERT', payload: undefined})
@@ -527,6 +527,10 @@ const Logbook: React.FC<unknown> = () => {
     dispatch({ type: 'SET_PAGES', payload: pages })
   }, [state.totalEntries, state.pagination?.pageSize])
 
+  useEffect(() => {
+    console.log(state.alert)
+  }, [state.alert])
+
   return (
     <>
       <div className={`${screenSize === ScreenSize.SM ? 'mr-4 ml-4' : 'mr-10 ml-10'} grid grid-cols-12`}>
@@ -550,14 +554,14 @@ const Logbook: React.FC<unknown> = () => {
               onClose={() =>
                 dispatch({ type: 'SET_ALERT', payload: undefined })
               }
-              severity={'info'}
+              severity={state.alert.severity}
             >
               {state.alert.message}
             </Alert>
           </div>
         )}
         {!state.isLoading && state.entries.length > 0 && screenSize !== ScreenSize.SM && screenSize !== ScreenSize.MD && (
-          <div className='col-span-12 pr-5 pb-5 pl-5 bg-base-100 border border-base-100 rounded-lg '>
+          <div className='col-span-12 pr-5 pb-5 pl-5 bg-base-100 border border-base-100 rounded-lg'>
             <div className='overflow-x-auto mb-5'>
               <div className='col-span-12 justify-self-end self-center mt-1 mr-1 mb-2'>
                 <label className='select select-sm select-ghost'>
@@ -569,7 +573,7 @@ const Logbook: React.FC<unknown> = () => {
                   >
                     <option value={10}>10</option>
                     <option value={25}>25</option>
-                    <option value={3}>50</option>
+                    <option value={50}>50</option>
                     <option value={state.totalEntries}>All</option>
                   </select>
                 </label>

client/vite.config.ts

@@ -13,6 +13,7 @@ export default defineConfig({
     strictPort: true
   },
   server: {
+    host: true,
     port: 8080,
     proxy: {
       '/api': {

docker-compose.yaml

@@ -9,9 +9,24 @@ services:
       - '10001:10001'
       - '10002:10002'
     command: 'azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0 --loose --skipApiVersionCheck'
+    healthcheck:
+      test: ["CMD", "nc", "-z", "127.0.0.1", "10000"]
     volumes: 
       - ./azurite-data:/data
 
+  seed:
+    image: mcr.microsoft.com/azure-cli
+    depends_on:
+      azurite:
+        condition: service_healthy
+    volumes:
+      - ./seed-data:/data
+    entrypoint: >
+      sh -c "
+      az storage container create --name mycontainer --connection-string 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;' &&
+      az storage blob upload-batch --destination mycontainer --source /data --connection-string 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;'
+      "
+
   restore:
     container_name: restore
     image: litestream/litestream:0.3.13
@@ -51,6 +66,7 @@ services:
         condition: service_started
 
 volumes:
-  # azurite-data:
+  azurite-data:
   backup:
   data:
+  seed-data:

infrastructure/.gitignore

@@ -2,3 +2,4 @@
 .terraform/*
 *.tfstate
 *.tfstate.*
+.DS_Store

infrastructure/backend/prod.backend.tfvars

@@ -0,0 +1 @@
+container_name = "tfstate-flying-prod"

infrastructure/backend/test.backend.tfvars

@@ -0,0 +1 @@
+container_name = "tfstate-flying-test"

infrastructure/terraform.tf

@@ -16,12 +16,9 @@ terraform {
     }
   }
 
-  backend "remote" {
+  backend "azurerm" {
-    hostname     = "app.terraform.io"
+    resource_group_name = "noahspan"
-    organization = "noahspan"
+    storage_account_name = "noahspanterraform"
-
+    key = "terraform.tfstate"
-    workspaces {
-      prefix = "noahspan-"
-    }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahspan/flying",
-  "version": "2.1.0",
+  "version": "2.1.5",
   "scripts": {
     "start": "node api/dist/main",
     "format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",