updating infrastructure container apps environment

* reverting to app on container app

* reverting to app on container app

* reverting to app on container app

api/README.md

@@ -1,73 +0,0 @@
-<p align="center">
-  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="200" alt="Nest Logo" /></a>
-</p>
-
-[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
-[circleci-url]: https://circleci.com/gh/nestjs/nest
-
-  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
-    <p align="center">
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
-<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
-<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
-<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
-<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
-<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
-  <a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg"/></a>
-    <a href="https://opencollective.com/nest#sponsor"  target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
-  <a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow"></a>
-</p>
-  <!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
-  [![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
-
-## Description
-
-[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
-
-## Installation
-
-```bash
-$ npm install
-```
-
-## Running the app
-
-```bash
-# development
-$ npm run start
-
-# watch mode
-$ npm run start:dev
-
-# production mode
-$ npm run start:prod
-```
-
-## Test
-
-```bash
-# unit tests
-$ npm run test
-
-# e2e tests
-$ npm run test:e2e
-
-# test coverage
-$ npm run test:cov
-```
-
-## Support
-
-Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
-
-## Stay in touch
-
-- Author - [Kamil Myśliwiec](https://kamilmysliwiec.com)
-- Website - [https://nestjs.com](https://nestjs.com/)
-- Twitter - [@nestframework](https://twitter.com/nestframework)
-
-## License
-
-Nest is [MIT licensed](LICENSE).

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "",
   "author": "",
   "private": true,
@@ -20,25 +20,24 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@azure/functions": "^1.0.3",
     "@nestjs/axios": "^4.0.0",
     "@nestjs/azure-func-http": "^0.10.0",
-    "@nestjs/common": "^10.0.0",
+    "@nestjs/common": "^11.0.11",
-    "@nestjs/config": "^4.0.0",
+    "@nestjs/config": "^4.0.1",
-    "@nestjs/core": "^10.0.0",
+    "@nestjs/core": "^11.0.11",
-    "@nestjs/platform-express": "^10.0.0",
+    "@nestjs/platform-express": "^11.0.11",
     "@noahspan/azure-database": "^3.1.2",
-    "@noahspan/noahspan-modules": "^1.0.0",
+    "@noahspan/noahspan-modules": "^1.1.5",
     "axios": "^1.7.9",
     "reflect-metadata": "^0.2.2",
-    "rxjs": "^7.8.2",
+    "rxjs": "7.8.2",
     "uuid": "^11.0.5"
   },
   "devDependencies": {
     "@angular-devkit/schematics": "^19.1.4",
-    "@nestjs/cli": "^10.0.0",
+    "@nestjs/cli": "^11.0.5",
-    "@nestjs/schematics": "^10.0.0",
+    "@nestjs/schematics": "^11.0.2",
-    "@nestjs/testing": "^10.0.0",
+    "@nestjs/testing": "^11.0.11",
     "@schematics/angular": "^19.1.4",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.2",

api/src/app.module.ts

@@ -1,8 +1,8 @@
 import { Module } from '@nestjs/common';
-import { APP_FILTER, APP_GUARD } from '@nestjs/core';
+import { APP_FILTER } from '@nestjs/core';
 import { HttpExceptionFilter } from './filters/http-exception.filter';
 import { ProjectModule } from './project/project.module';
-import { AuthGuard, AuthModule, UserModule } from '@noahspan/noahspan-modules'
+import { AuthModule, UserModule } from '@noahspan/noahspan-modules'
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import configuration from './config/configuration';
 
@@ -39,10 +39,6 @@ import configuration from './config/configuration';
     {
       provide: APP_FILTER,
       useClass: HttpExceptionFilter
-    },
-    {
-      provide: APP_GUARD,
-      useClass: AuthGuard
     }
   ]
 })

api/src/index.css

@@ -0,0 +1,3 @@
+body {
+  background-color: #f2f2f2;
+}

api/src/project/project.controller.ts

@@ -12,13 +12,14 @@ import {
 import { ProjectDto } from './project.dto';
 import { Project } from './project.entity';
 import { ProjectService } from './project.service';
-import { CustomError, Public } from '@noahspan/noahspan-modules';
+import { AuthGuard, CustomError, Public } from '@noahspan/noahspan-modules';
 
 @Controller('projects')
 export class ProjectController {
   constructor(private readonly projectService: ProjectService) {}
 
   @Get(':partitionKey/:rowKey')
+  @UseGuards(AuthGuard)
   async find(
     @Param('partitionKey') partitionKey: string,
     @Param('rowKey') rowKey: string
@@ -32,12 +33,12 @@ export class ProjectController {
     }
   }
 
-  @Public()
   @Get()
   async findAll() {
     try {
       return await this.projectService.findAll();
     } catch (error) {
+      console.log(error)
       const customError = error as CustomError;
 
       throw new HttpException(customError.message, customError.statusCode);
@@ -45,6 +46,7 @@ export class ProjectController {
   }
 
   @Post()
+  @UseGuards(AuthGuard)
   async create(@Body() projectDto: ProjectDto) {
     try {
       const project = new Project();
@@ -60,6 +62,7 @@ export class ProjectController {
   }
 
   @Put(':partitionKey/:rowKey')
+  @UseGuards(AuthGuard)
   async update(
     @Param('partitionKey') partitionKey: string,
     @Param('rowKey') rowKey: string,
@@ -79,6 +82,7 @@ export class ProjectController {
   }
 
   @Delete(':partitionKey/:rowKey')
+  @UseGuards(AuthGuard)
   async delete(
     @Param('partitionKey') partitionKey: string,
     @Param('rowKey') rowKey: string

api/src/project/project.entity.ts

@@ -1,7 +1,9 @@
+import { EntityString } from '@noahspan/azure-database';
+
 export class Project {
-  partitionKey: string;
+  @EntityString() partitionKey: string;
-  rowKey: string;
+  @EntityString() rowKey: string;
-  displayName: string;
+  @EntityString() displayName: string;
-  icon: string;
+  @EntityString() icon: string;
-  summary: string;
+  @EntityString() summary: string;
 }

api/src/project/project.module.ts

@@ -17,7 +17,7 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
       inject: [ConfigService]
     }),
     AzureTableStorageModule.forFeature(Project, {
-      createTableIfNotExists: true,
+      createTableIfNotExists: false,
       table: 'projects'
     }),
   ],

api/src/project/project.service.ts

@@ -1,7 +1,6 @@
 import { InjectRepository, Repository } from '@noahspan/azure-database';
 import { Injectable } from '@nestjs/common';
 import { Project } from './project.entity';
-import { v4 as uuidv4 } from 'uuid';
 
 @Injectable()
 export class ProjectService {

app/README.md

@@ -1,50 +1 @@
-# React + TypeScript + Vite
+# APP
-
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
-
-Currently, two official plugins are available:
-
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
-
-## Expanding the ESLint configuration
-
-If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
-
-- Configure the top-level `parserOptions` property like this:
-
-```js
-export default tseslint.config({
-  languageOptions: {
-    // other options...
-    parserOptions: {
-      project: ['./tsconfig.node.json', './tsconfig.app.json'],
-      tsconfigRootDir: import.meta.dirname,
-    },
-  },
-})
-```
-
-- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
-- Optionally add `...tseslint.configs.stylisticTypeChecked`
-- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config:
-
-```js
-// eslint.config.js
-import react from 'eslint-plugin-react'
-
-export default tseslint.config({
-  // Set the react version
-  settings: { react: { version: '18.3' } },
-  plugins: {
-    // Add the react plugin
-    react,
-  },
-  rules: {
-    // other rules...
-    // Enable its recommended rules
-    ...react.configs.recommended.rules,
-    ...react.configs['jsx-runtime'].rules,
-  },
-})
-```

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "app",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -13,7 +13,7 @@
     "@azure/msal-browser": "^4.2.1",
     "@azure/msal-react": "^3.0.4",
     "@microsoft/microsoft-graph-types": "^2.40.0",
-    "@noahspan/noahspan-components": "^1.3.1",
+    "@noahspan/noahspan-components": "^1.8.1",
     "axios": "^1.7.9",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",

app/src/components/projectForm/ProjectForm.tsx

@@ -47,7 +47,6 @@ const ProjectForm = ({ isDrawerOpen, mode, onOpenClose, projectId }: ProjectForm
   };
 
   const onSubmit = async (data: unknown) => {
-    console.log(data)
     try {
       dispatch({ type: 'SET_IS_LOADING', payload: true });
 

app/src/components/projects/Projects.tsx

@@ -11,7 +11,8 @@ import {
   Grid,
   Icon,
   IconName,
-  Spinner,
+  Skeleton,
+  Stack,
   Typography
 } from '@noahspan/noahspan-components';
 import { useIsAuthenticated } from '@azure/msal-react';
@@ -38,11 +39,13 @@ const Projects = () => {
       );
       const projects: Project[] = response.data;
 
-      projects.sort((a, b) => Number(a.order) - Number(b.order))
+      projects.sort((a, b) => Number(a.order) - Number(b.order));
 
       return projects;
     } catch (error) {
-      throw new Error('broken');
+      const axiosError = error as AxiosError;
+
+      throw new Error(axiosError.message);
     }
   };
 
@@ -122,8 +125,16 @@ const Projects = () => {
       try {
         dispatch({ type: 'SET_IS_LOADING', payload: true })
         const projects = await getProjects();
+        
+        if (projects.length > 0) {
+          dispatch({ type: 'SET_PROJECTS', payload: projects });
 
-        dispatch({ type: 'SET_PROJECTS', payload: projects })
+          if (state.alert) {
+            dispatch({ type: 'SET_ALERT', payload: undefined })
+          }
+        } else {
+          dispatch({ type: 'SET_ALERT', payload: { severity: 'info', message: 'No projects found.'}});
+        }
       } catch (error) {
         dispatch({
           type: 'SET_ALERT',
@@ -219,22 +230,42 @@ const Projects = () => {
                         }
                       </Grid>
                     </Grid>
-                    
                   </CardActions>
                 </Card>
               </Grid>
             )
           })}
-          {state.isLoading && (
+          {state.isLoading && [...Array(6)].map((_element, index) => {
-            <>
+            return (
-              <Grid display="flex" justifyContent="center" size={12}>
+              <Grid display='flex' justifyContent='center' size={12}>
-                <Spinner />
+                <Card
+                  key={index}
+                  sx={{
+                    width: '100%'
+                  }}
+                >
+                  <CardContent>
+                    <Grid container spacing={2}>
+                      <Grid size={1}>
+                        <Skeleton height={100} width={60} />
+                      </Grid>
+                      <Grid size={11}>
+                        <Stack>
+                          <Skeleton height={60} />
+                          <Skeleton height={30} />
+                        </Stack>
+                      </Grid>
+                      <Grid size={12}>
+                        <Skeleton />
+                        <Skeleton />
+                        <Skeleton />
+                      </Grid>
+                    </Grid>
+                  </CardContent>
+                </Card>
               </Grid>
-              <Grid display="flex" justifyContent="center" size={12}>
+            )
-                Loading...
+          })}
-              </Grid>
-            </>
-          )}
         </Grid>
         {state.isFormOpen && 
           <ProjectForm

app/src/components/siteNav/SiteNav.tsx

@@ -69,7 +69,6 @@ const SiteNav: React.FC<unknown> = () => {
 
       return imageUrl;
     } catch (error) {
-      console.log(error);
       throw new Error();
     }
   };
@@ -94,7 +93,6 @@ const SiteNav: React.FC<unknown> = () => {
         const accessToken: string = await getAccessToken();
         const userProfile = await getUserProfile(accessToken);
         const userPhoto = await getUserPhoto(accessToken);
-        console.log(userPhoto)
 
         setUserPhoto(userPhoto);
 

app/src/index.css

@@ -0,0 +1,3 @@
+body {
+  background-color: #f2f2f2;
+}

app/src/main.tsx

@@ -6,6 +6,7 @@ import { BrowserRouter } from 'react-router-dom';
 import { AuthenticationResult, EventMessage, EventType, PublicClientApplication } from '@azure/msal-browser';
 import { msalConfig } from './auth/msalConfig.ts';
 import AppContextProvider from './context/appContext/AppContextProvider.tsx';
+import './index.css';
 
 const msalInstance: PublicClientApplication = new PublicClientApplication(msalConfig);
 

data/profile/profile.json

@@ -1,212 +0,0 @@
-{
-  "experiences": [
-    {
-      "jobTitle": "Senior Software Engineer",
-      "company": "Sensonix, Inc.",
-      "location": "Plymouth, Minnesota",
-      "startDate": "April 2023",
-      "endDate": "Present",
-      "details": null
-    },
-    {
-      "jobTitle": "Senior Software Engineer",
-      "company": "Amano McGann, Inc.",
-      "location": "Roseville, Minnesota",
-      "startDate": "July 2022",
-      "endDate": "April 2023",
-      "details": null
-    },
-    {
-      "jobTitle": "Senior Software Engineer",
-      "company": "Optum",
-      "location": "Eden Prairie, Minnesota",
-      "startDate": "March 2021",
-      "endDate": "June 2022",
-      "details": null
-    },
-    {
-      "jobTitle": "Senior Software Engineer",
-      "company": "Target",
-      "location": "Minneapolis, Minnesota",
-      "startDate": "December 2018",
-      "endDate": "February 2021",
-      "details": null
-    },
-    {
-      "jobTitle": "Developer, Business Systems",
-      "company": "Minnesota Twins",
-      "location": "Minneapolis, Minnesota",
-      "startDate": "February 2017",
-      "endDate": "December 2018",
-      "details": null
-    },
-    {
-      "jobTitle": "SharePoint Administrator/Developer",
-      "company": "Minnesota Judicial Branch",
-      "location": "Saint Paul, Minnesota",
-      "startDate": "January 2016",
-      "endDate": "February 2017",
-      "details": null
-    },
-    {
-      "jobTitle": "Consultant",
-      "company": "Magenic Technologies",
-      "location": "Saint Louis Park, Minnesota",
-      "startDate": "August 2011",
-      "endDate": "January 2016",
-      "details": null
-    }
-  ],
-  "education": [
-    {
-      "school": "Metropolitan State University",
-      "location": "Saint Paul, Minnesota",
-      "degree": "Bachelor of Arts",
-      "fieldOfStudy": "Technical Communication"
-    },
-    {
-      "school": "Century College",
-      "location": "White Bear Lake, Minnesota",
-      "degree": "Associate of Arts",
-      "fieldOfStudy": "Liberal Arts"
-    }
-  ],
-  "about": {
-    "details": "\\# This is some markdown.",
-    "summary": null
-  },
-  "intro": {
-    "firstName": "Noah",
-    "lastName": "Spannbauer",
-    "photoUrl": null,
-    "title": "Senior Software Engineer",
-    "location": "Minneapolis, Minnesota, United States"
-  },
-  "skills": [
-    {
-      "category": "Experienced",
-      "group": "Agile Methodologies",
-      "skills": [
-        "Scrum"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Containerization",
-      "skills": [
-        "Docker",
-        "Kubernetes",
-        "Helm"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Continuous Integration and Continuous Delivery",
-      "skills": [
-        "GitHub Actions",
-        "Argo CD"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Database",
-      "skills": [
-        "PostgreSQL"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Front-End Web Development",
-      "skills": [
-        "React",
-        "Node.js"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Infrastructure as Code",
-      "skills": [
-        "Terraform"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Messaging",
-      "skills": [
-        "RabbitMQ"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Programming Languages",
-      "skills": [
-        "JavaScript",
-        "Typescript"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Test Automation",
-      "skills": [
-        "Cucumber",
-        "Gherkin",
-        "Jest",
-        "Playwright"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Cloud",
-      "skills": [
-        "Amazon Web Services (AWS)"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Cloud",
-      "skills": [
-        "Azure"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Continuous Integration and Continuous Delivery",
-      "skills": [
-        "Azure DevOps",
-        "Drone",
-        "Vela"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Database",
-      "skills": [
-        "MongoDB",
-        "SQL Server"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Messaging",
-      "skills": [
-        "Khafka"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Programming Languages",
-      "skills": [
-        "C#",
-        "Powershell"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Test Automation",
-      "skills": [
-        "Cypress"
-      ]
-    }
-  ],
-  "___mb_schema": "/.mattrbld/schemas/Profile.json"
-}

data/projects/projects.json

@@ -1,23 +0,0 @@
-{
-  "projects": [
-    {
-      "repoName": "noahspan-components",
-      "title": "Components (React + Storybook)",
-      "iconName": "fa-puzzle-piece",
-      "summary": "A component library with custom React components, extended components from Material UI, and a subset of Font Awesome icons."
-    },
-    {
-      "repoName": "noahspan-flying",
-      "title": "Flying (React + Nest.js)",
-      "iconName": "fa-plane",
-      "summary": "A pilot logbook for logging flight hours."
-    },
-    {
-      "repoName": "noahspan-modules",
-      "title": "Modules (Nest.js)",
-      "iconName": "fa-gear",
-      "summary": "A library of custom modules for projects using Nest.js."
-    }
-  ],
-  "___mb_schema": "/.mattrbld/schemas/Projects.json"
-}

docker-compose.yaml

@@ -2,13 +2,15 @@ version: '3.8'
 
 services:
   azurite:
-    container_name: azurite
+    container_name: azurite-root
     image: mcr.microsoft.com/azure-storage/azurite:3.33.0
     ports:
       - '10000:10000'
       - '10001:10001'
       - '10002:10002'
     command: 'azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0 --loose'
+    volumes: 
+      - ./azurite-root:/data
 
   api:
     container_name: root-api
@@ -26,4 +28,7 @@ services:
       context: .
       target: app
     ports: 
-      - '8080:8080'
+      - '8080:8080'
+
+volumes:
+  azurite-root:

infrastructure/.terraform.lock.hcl

@@ -2,20 +2,20 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/azurerm" {
-  version = "3.104.0"
+  version = "4.26.0"
   hashes = [
-    "h1:SSBkZNrevDxOI6j9tVel7/BKX/5xaMYUqx4qhLvrjS4=",
+    "h1:Vdylhj5W0M+J62bOOdvVUlmGB7M5TfaNRcThdb8ydcc=",
-    "zh:01aa74b1e13c797b20407c37c683b945ffb24462bb39cdaddcf5b3297272c85a",
+    "zh:0e381bace81028596d60e253bc320bf62d00ae2ec207d7c7e70cdbec5f543334",
-    "zh:42c3a69ece44ed6dbd5145dadbdbde9a2e99c3dc0b5a0b28544fd68e796a755d",
+    "zh:32c8cf70e476a4d0e0a2d4cb94b4a4e95c287c5972ca1e8c0f37dc629fbe31cb",
-    "zh:48102182e71a10f8337828239d770953fb54e95c4f617a5a327316ba7d9c9aa5",
+    "zh:568ebaa4c66fc668dc14c8ff323e47fc7b2ac3b5a5d9eec612de2b6a30164f4c",
-    "zh:4c086420f1acc033b5901dc266721a38f43cbab43dedae149df3ccd8d1a3615d",
+    "zh:596c218810ffb85bc7224574b6ba6dbab9295bfa7490eac98c5ff88beae75710",
-    "zh:634e3d701798d699f502c86d1ee591778fa0a46be81a220bd849c0389cd742f1",
+    "zh:75a0e5b60f24684d62944714deb1c790b17c8d4acc93b5cdb45a8187d887b7f1",
-    "zh:6aa0c6cb606dcd8efe90fb9fb872aa5406119264ce2819d8daf35c813e6ba2f7",
+    "zh:7d2abea6ab66a08fed7d1ab8d4f3a8344fe7e2ac76d7409a3e40e8c066df6f22",
-    "zh:8604d0a159b1905d7a92448d5e2e1ec0b3275b9b2d8f7986f4a566f570a6f90c",
+    "zh:7f4db75991fd610b2c0306226e5e1916d4b633cdb0126bc78951dce2365b3418",
-    "zh:912ddd9a43cbb168a58f1af625a8fe111e505c059442ad6126905449e5013877",
+    "zh:95fe307defb6e0dc172855fa597140f3da96655b3c558c140ae51a4a6077f58d",
-    "zh:9ed54f1e7ae7881611ae659bfbd11db878adc77aa848b920cc0d76a1ab41a2ac",
+    "zh:ae07cdd3c658c0e24d45f1cfadf8b085b18981bcd72a20093ce3f042ed0adf3f",
-    "zh:b507020a566bdbc0dfe868103664361e8ee5549de6edceb7f5d6837dcd8af5a3",
+    "zh:d2a471b9e42499a7247f873aebd5cbc8df0c6691f02a5c9b556aa00045c06869",
+    "zh:e0299c0f6eae2b1c935f552f76fc49a2e61975eeda9410e3920a004b74d9e750",
     "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
-    "zh:f7fc6699a0359183911448bf9736777cd6d8ce91fd20d682cf635fa58e2905dd",
   ]
 }

infrastructure/config/container_app_environment/main.tf

@@ -0,0 +1,11 @@
+locals {
+  name = {
+    test = "noahspan-test"
+    prod = "noahspan-prod"
+  }
+
+  log_analytics_workspace_name = {
+    test = "noahspan-log-analytics-workspace-test"
+    prod = "noahspan-log-analytics-workspace-prod"
+  }
+}

infrastructure/config/container_app_environment/outputs.tf

@@ -0,0 +1,7 @@
+output "name" {
+  value = local.name[var.environment]
+}
+
+output "log_analytics_workspace_name" {
+  value = local.log_analytics_workspace_name[var.environment]
+}

infrastructure/config/container_app_environment/variables.tf

@@ -0,0 +1 @@
+variable "environment" {}

infrastructure/config/main.tf

@@ -1,61 +1,4 @@
-locals {
+module "container_app_environment" {
-  container_app_app_name = {
+  source = "./container_app_environment"
-    test = "root-app-test"
+  environment = var.environment
-    prod = "root-app-prod"
-  }
-
-  container_app_app_container_image = {
-    test = "noahspan/root-app:v1.0.0"
-    prod = "noahspan/root-app:v1.0.0"
-  }
-
-  container_app_app_container_name = {
-    test = "root-app-test"
-    prod = "root-app-prod"
-  }
-
-  container_app_api_name = {
-    test = "root-api-test"
-    prod = "root-api-prod"
-  }
-
-  container_app_api_container_image = {
-    test = "noahspan/root-api:v1.0.0"
-    prod = "noahspan/root-api:v1.0.0"
-  }
-
-  container_app_api_container_name = {
-    test = "root-api-test"
-    prod = "root-api-prod"
-  }
-
-  container_app_api_dapr_app_id = {
-    test = "rootapitest"
-    prod = "rootpapiprod"
-  }
-
-  container_app_environment_name = {
-    test = "root-test"
-    prod = "root-prod"
-  }
-
-  custom_domain_count = {
-    test = 0
-    prod = 1
-  }
-
-  log_analytics_workspace_name = {
-    test = "root-log-analytics-workspace-test"
-    prod = "root-log-analytics-workspace-prod"
-  }
-
-  storage_account_name = {
-    test = "noahspanroottest"
-    prod = "noahspanrootprod"
-  }
-
-  storage_tables = {
-    test = ["projects"]
-    prod = ["projects"]
-  }
 }

infrastructure/config/outputs.tf

@@ -1,47 +1,3 @@
-output "container_app_app_name" {
+output "container_app_environment" {
-  value = local.container_app_app_name[var.environment]
+  value = module.container_app_environment
-}
-
-output "container_app_app_container_image" {
-  value = local.container_app_app_container_image[var.environment]
-}
-
-output "container_app_app_container_name" {
-  value = local.container_app_app_container_name[var.environment]
-}
-
-output "container_app_api_name" {
-  value = local.container_app_api_name[var.environment]
-}
-
-output "container_app_api_container_image" {
-  value = local.container_app_api_container_image[var.environment]
-}
-
-output "container_app_api_container_name" {
-  value = local.container_app_api_container_name[var.environment]
-}
-
-output "container_app_api_dapr_app_id" {
-  value = local.container_app_api_dapr_app_id[var.environment]
-}
-
-output "container_app_environment_name" {
-  value = local.container_app_environment_name[var.environment]
-}
-
-output "custom_domain_count" {
-  value = local.custom_domain_count[var.environment]
-}
-
-output "log_analytics_workspace_name" {
-  value = local.log_analytics_workspace_name[var.environment]
-}
-
-output "storage_account_name" {
-  value = local.storage_account_name[var.environment]
-}
-
-output "storage_tables" {
-  value = local.storage_tables[var.environment]
 }

infrastructure/main.tf

@@ -1,29 +1,40 @@
-module "storage" {
+# module "storage" {
-  source = "github.com/noahspannbauer/noahspan-terraform/modules/storage"
+#   source = "github.com/noahspannbauer/noahspan-terraform/modules/storage"
-  resource_group_name = var.RESOURCE_GROUP_NAME
+#   resource_group_name = var.RESOURCE_GROUP_NAME
-  storage_account_name = module.environment.storage_account_name
+#   static_websites = module.environment.static_websites
-  storage_tables = module.environment.storage_tables
+#   storage_account_name = module.environment.storage_account_name
-}
+#   storage_blobs = module.environment.storage_blobs
+#   storage_tables = module.environment.storage_tables
+# }
 
-module "container_app" {
+# module "container_app" {
-  source = "github.com/noahspannbauer/noahspan-terraform/modules/container_app"
+#   source = "github.com/noahspannbauer/noahspan-terraform/modules/container_app"
-  app_subdomain_name = var.APP_SUBDOMAIN_NAME
+#   app_subdomain_name = var.APP_SUBDOMAIN_NAME
-  client_id = var.CLIENT_ID
+#   client_id = var.CLIENT_ID
-  client_secret = var.CLIENT_SECRET
+#   client_secret = var.CLIENT_SECRET
-  container_app_app_name = module.environment.container_app_app_name
+#   container_app_app_name = module.environment.container_app_app_name
-  container_app_app_container_image = module.environment.container_app_api_container_image
+#   container_app_app_container_image = module.environment.container_app_api_container_image
-  container_app_app_container_name = module.environment.container_app_api_container_name
+#   container_app_app_container_name = module.environment.container_app_api_container_name
-  container_app_api_name = module.environment.container_app_api_name
+#   container_app_api_name = module.environment.container_app_api_name
-  container_app_api_container_image = module.environment.container_app_api_container_image
+#   container_app_api_container_image = module.environment.container_app_api_container_image
-  container_app_api_container_name = module.environment.container_app_api_container_name
+#   container_app_api_container_name = module.environment.container_app_api_container_name
-  container_app_environment_name = module.environment.container_app_environment_name
+#   container_app_environment_name = module.environment.container_app_environment_name
-  custom_domain_count = module.environment.custom_domain_count
+#   custom_domain_count = module.environment.custom_domain_count
-  dns_zone_resource_group = var.DNS_ZONE_RESOURCE_GROUP
+#   dns_zone_resource_group = var.DNS_ZONE_RESOURCE_GROUP
-  docker_io_password = var.DOCKER_IO_PASSWORD
+#   docker_io_password = var.DOCKER_IO_PASSWORD
-  docker_io_username = var.DOCKER_IO_USERNAME
+#   docker_io_username = var.DOCKER_IO_USERNAME
-  domain_name = var.DOMAIN_NAME
+#   domain_name = var.DOMAIN_NAME
-  log_analytics_workspace_name = module.environment.log_analytics_workspace_name
+#   log_analytics_workspace_name = module.environment.log_analytics_workspace_name
+#   resource_group_name = var.RESOURCE_GROUP_NAME
+#   storage_account_primary_connection_string = module.storage.storage_account_primary_connection_string
+#   tenant_id = var.TENANT_ID
+# }
+
+module "container_app_environment" {
+  source = "github.com/noahspannbauer/noahspan-terraform/modules/container_app_environment"
+  container_app_environment_name = module.environment.container_app_environment.name
+  log_analytics_workspace_name = module.environment.container_app_environment.log_analytics_workspace_name
+  log_analytics_workspace_retention_in_days = 30
+  log_analytics_workspace_sku = "PerGB2018"
   resource_group_name = var.RESOURCE_GROUP_NAME
-  storage_account_primary_connection_string = module.storage.storage_account_primary_connection_string
-  tenant_id = var.TENANT_ID
 }

infrastructure/terraform.tf

@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.1.0"
+  required_version = ">= 1.13.0"
 
   required_providers {
     azurerm = {

infrastructure/variables.tf

@@ -1,20 +1,3 @@
-variable "APP_SUBDOMAIN_NAME" {
-  type = string
-}
-
-variable "CLIENT_ID" {
-  type = string
-}
-
-variable "CLIENT_SECRET" {
-  type = string
-  sensitive = true
-}
-
-variable "DNS_ZONE_RESOURCE_GROUP" {
-  type = string
-}
-
 variable "DOCKER_IO_PASSWORD" {
   type = string
   sensitive = true
@@ -24,10 +7,6 @@ variable "DOCKER_IO_USERNAME" {
   type = string
 }
 
-variable "DOMAIN_NAME" {
-    type = string
-}
-
 variable "RESOURCE_GROUP_NAME" {
   type = string
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahspan/noahspan-root",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "preprod": "rimraf ./.prod && pnpm --filter api build && pnpm --filter app build",