added setup, reorganized

bradygaster · Jun 7, 2020 · fe0197d · fe0197d
1 parent ad16904
commit fe0197d
Show file tree

Hide file tree

Showing 30 changed files with 34 additions and 92 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,15 +10,14 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/bin/Debug/netcoreapp3.1/COVIDScreeningApi.dll",
+            "program": "${workspaceFolder}/src/COVIDScreeningApi/bin/Debug/netcoreapp3.1/COVIDScreeningApi.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi",
+            "cwd": "${workspaceFolder}/src/COVIDScreeningApi",
             "stopAtEntry": false,
             // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {
                 "action": "openExternally",
-                "pattern": "^\\s*Now listening on:\\s+(https?://\\S+)",
-                "uriFormat": "%s/swagger"
+                "pattern": "^\\s*Now listening on:\\s+(https?://\\S+)"
             },
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -7,7 +7,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/COVIDScreeningApi.csproj",
+                "${workspaceFolder}/src/COVIDScreeningApi/COVIDScreeningApi.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -19,7 +19,7 @@
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/COVIDScreeningApi.csproj",
+                "${workspaceFolder}/src/COVIDScreeningApi/COVIDScreeningApi.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -32,67 +32,11 @@
             "args": [
                 "watch",
                 "run",
-                "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/COVIDScreeningApi.csproj",
+                "${workspaceFolder}/src/COVIDScreeningApi/COVIDScreeningApi.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
-        },
-        {
-            "type": "docker-build",
-            "label": "docker-build: debug",
-            "dependsOn": [
-                "build"
-            ],
-            "dockerBuild": {
-                "tag": "covidscreeningapi:dev",
-                "target": "base",
-                "dockerfile": "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/Dockerfile",
-                "context": "${workspaceFolder}",
-                "pull": true
-            },
-            "netCore": {
-                "appProject": "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/COVIDScreeningApi.csproj"
-            }
-        },
-        {
-            "type": "docker-build",
-            "label": "docker-build: release",
-            "dependsOn": [
-                "build"
-            ],
-            "dockerBuild": {
-                "tag": "covidscreeningapi:latest",
-                "dockerfile": "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/Dockerfile",
-                "context": "${workspaceFolder}",
-                "pull": true
-            },
-            "netCore": {
-                "appProject": "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/COVIDScreeningApi.csproj"
-            }
-        },
-        {
-            "type": "docker-run",
-            "label": "docker-run: debug",
-            "dependsOn": [
-                "docker-build: debug"
-            ],
-            "dockerRun": {},
-            "netCore": {
-                "appProject": "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/COVIDScreeningApi.csproj",
-                "enableDebugging": true
-            }
-        },
-        {
-            "type": "docker-run",
-            "label": "docker-run: release",
-            "dependsOn": [
-                "docker-build: release"
-            ],
-            "dockerRun": {},
-            "netCore": {
-                "appProject": "${workspaceFolder}/Start/COVIDScreeningApi/COVIDScreeningApi/COVIDScreeningApi.csproj"
-            }
         }
     ]
 }
diff --git a/Start/COVIDScreeningApi/.dockerignore b/Start/COVIDScreeningApi/.dockerignore
diff --git a/create-resources.azcli b/create-resources.azcli
@@ -0,0 +1,27 @@
+# the name of the resource group
+resource-group="covid-screening-app-resources"
+
+# the name of the api management resource
+apim-name="screening-apis"
+
+# the name of the cosmos db resource
+cosmos-db-name="screeningcosmosdb"
+
+# the region in which we want things to be created
+region="westus"
+
+# create the resource group
+az group create --name $resource-group --location $region
+
+# create the cosmos db resource
+az cosmosdb create --name $cosmos-db-name --resource-group $resource-group
+
+# create the cosmos db in the cosmos db resource
+az cosmosdb database create --name $cosmos-db-name --resource-group $resource-group --db-name "COVIDScreeningDb"
+
+# create the 3 collections in the cosmos db resource we'll need
+
+# get the connection string of the cosmos db resource
+
+# create the apim resource
+az apim create --name $apim-name
diff --git a/.../COVIDScreeningApi/import-api-to-apim.ps1 → import-api-to-apim.ps1 b/.../COVIDScreeningApi/import-api-to-apim.ps1 → import-api-to-apim.ps1
@@ -1,9 +1,7 @@
-cls
-
 # Variables
 Set-Variable -Name ResourceGroupName "COVIDScreeningAPI"
 Set-Variable -Name ApimInstance "screening-app-apis"
-Set-Variable -Name SwaggerFilePath "C:\Users\brady\source\repos\bradygaster\COVIDScreeningApi\Start\COVIDScreeningApi\COVIDScreeningApi\bin\Debug\netcoreapp3.1\swagger.json"
+Set-Variable -Name SwaggerFilePath "./src/COVIDScreeningApi/bin/Debug/netcoreapp3.1/swagger.json"
 Set-Variable -Name ServiceUrl "https://covid-screening-api.azurewebsites.net"
 Set-Variable -Name ApiId "COVIDScreeningApi"
 Set-Variable -Name ApiVersion "v1"

diff --git a/.dockerignore → src/.dockerignore b/.dockerignore → src/.dockerignore
diff --git a/...t/COVIDScreeningApi/COVIDScreeningApi.sln → src/COVIDScreeningApi.sln b/...t/COVIDScreeningApi/COVIDScreeningApi.sln → src/COVIDScreeningApi.sln
diff --git a/...VIDScreeningApi/.config/dotnet-tools.json → ...VIDScreeningApi/.config/dotnet-tools.json b/...VIDScreeningApi/.config/dotnet-tools.json → ...VIDScreeningApi/.config/dotnet-tools.json
diff --git a/...OVIDScreeningApi/COVIDScreeningApi.csproj → ...OVIDScreeningApi/COVIDScreeningApi.csproj b/...OVIDScreeningApi/COVIDScreeningApi.csproj → ...OVIDScreeningApi/COVIDScreeningApi.csproj
diff --git a/...Api/Controllers/PortsOfEntryController.cs → ...Api/Controllers/PortsOfEntryController.cs b/...Api/Controllers/PortsOfEntryController.cs → ...Api/Controllers/PortsOfEntryController.cs
diff --git a/...ntrollers/RepresentativeDataController.cs → ...ntrollers/RepresentativeDataController.cs b/...ntrollers/RepresentativeDataController.cs → ...ntrollers/RepresentativeDataController.cs
diff --git a/...ntrollers/ScreeningDataTableController.cs → ...ntrollers/ScreeningDataTableController.cs b/...ntrollers/ScreeningDataTableController.cs → ...ntrollers/ScreeningDataTableController.cs
diff --git a/...Api/COVIDScreeningApi/Data/DataContext.cs → src/COVIDScreeningApi/Data/DataContext.cs b/...Api/COVIDScreeningApi/Data/DataContext.cs → src/COVIDScreeningApi/Data/DataContext.cs
diff --git a/...Api/COVIDScreeningApi/Data/PortOfEntry.cs → src/COVIDScreeningApi/Data/PortOfEntry.cs b/...Api/COVIDScreeningApi/Data/PortOfEntry.cs → src/COVIDScreeningApi/Data/PortOfEntry.cs
diff --git a/.../COVIDScreeningApi/Data/Representative.cs → src/COVIDScreeningApi/Data/Representative.cs b/.../COVIDScreeningApi/Data/Representative.cs → src/COVIDScreeningApi/Data/Representative.cs
diff --git a/...ngApi/COVIDScreeningApi/Data/Screening.cs → src/COVIDScreeningApi/Data/Screening.cs b/...ngApi/COVIDScreeningApi/Data/Screening.cs → src/COVIDScreeningApi/Data/Screening.cs
diff --git a/...ScreeningApi/COVIDScreeningApi/Dockerfile → src/COVIDScreeningApi/Dockerfile b/...ScreeningApi/COVIDScreeningApi/Dockerfile → src/COVIDScreeningApi/Dockerfile
diff --git a/...ture/DbContextOptionsBuilderExtensions.cs → ...ture/DbContextOptionsBuilderExtensions.cs b/...ture/DbContextOptionsBuilderExtensions.cs → ...ture/DbContextOptionsBuilderExtensions.cs
diff --git a/...cture/DefaultWebHostNameDocumentFilter.cs → ...cture/DefaultWebHostNameDocumentFilter.cs b/...cture/DefaultWebHostNameDocumentFilter.cs → ...cture/DefaultWebHostNameDocumentFilter.cs
diff --git a/.../COVIDScreeningApi/Models/PortsOfEntry.cs → src/COVIDScreeningApi/Models/PortsOfEntry.cs b/.../COVIDScreeningApi/Models/PortsOfEntry.cs → src/COVIDScreeningApi/Models/PortsOfEntry.cs
diff --git a/...ScreeningApi/Models/RepresentativeData.cs → ...ScreeningApi/Models/RepresentativeData.cs b/...ScreeningApi/Models/RepresentativeData.cs → ...ScreeningApi/Models/RepresentativeData.cs
diff --git a/...ScreeningApi/Models/ScreeningDataTable.cs → ...ScreeningApi/Models/ScreeningDataTable.cs b/...ScreeningApi/Models/ScreeningDataTable.cs → ...ScreeningApi/Models/ScreeningDataTable.cs
diff --git a/...ScreeningApi/COVIDScreeningApi/Program.cs → src/COVIDScreeningApi/Program.cs b/...ScreeningApi/COVIDScreeningApi/Program.cs → src/COVIDScreeningApi/Program.cs
diff --git a/...reeningApi/Properties/launchSettings.json → ...reeningApi/Properties/launchSettings.json b/...reeningApi/Properties/launchSettings.json → ...reeningApi/Properties/launchSettings.json
diff --git a/...ngApi/Properties/serviceDependencies.json → ...ngApi/Properties/serviceDependencies.json b/...ngApi/Properties/serviceDependencies.json → ...ngApi/Properties/serviceDependencies.json
diff --git a/...Properties/serviceDependencies.local.json → ...Properties/serviceDependencies.local.json b/...Properties/serviceDependencies.local.json → ...Properties/serviceDependencies.local.json
diff --git a/...ScreeningApi/COVIDScreeningApi/Startup.cs → src/COVIDScreeningApi/Startup.cs b/...ScreeningApi/COVIDScreeningApi/Startup.cs → src/COVIDScreeningApi/Startup.cs
diff --git a/...ScreeningApi/appsettings.Development.json → ...ScreeningApi/appsettings.Development.json b/...ScreeningApi/appsettings.Development.json → ...ScreeningApi/appsettings.Development.json
diff --git a/...ingApi/COVIDScreeningApi/appsettings.json → src/COVIDScreeningApi/appsettings.json b/...ingApi/COVIDScreeningApi/appsettings.json → src/COVIDScreeningApi/appsettings.json
diff --git a/...creeningApi/COVIDScreeningApi/deploy.yaml → src/COVIDScreeningApi/deploy.yaml b/...creeningApi/COVIDScreeningApi/deploy.yaml → src/COVIDScreeningApi/deploy.yaml