Update fork

.github/workflows/deployAzureFunctions.yaml → .github/workflows/deploy-apis.yaml

@@ -34,4 +34,8 @@ jobs:
       with:
         app-name: ${{ secrets.AZURE_FUNCTIONAPP_NAME }} # this is the name of the function established in the env portion
         package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }} # this is the path established in the env portion
-        publish-profile: ${{ secrets.AZURE_FUNCTIONAPP_PUBLISH_PROFILE }} # this is the secret we've created on GitHub that contains the details necessary to push to Azure
+        publish-profile: ${{ secrets.AZURE_FUNCTIONAPP_PUBLISH_PROFILE }} # this is the secret we've created on GitHub that contains the details necessary to push to Azure
+
+        # This file was used as reference for deployment of the function app
+        # (getting values for app-name and publish-profile for the function app)
+        # Feb-10-2021

.github/workflows/deploy-ui.yml

@@ -0,0 +1,31 @@
+# deploy to blob storage =>
+name: Build and deploy the app to the Azure Blob Storage
+
+on:
+  push:
+    branches:
+      - development
+env:
+  AZURE_WEBAPP_PACKAGE_PATH: ui/react-ui
+  NODE_VERSION: '10.x'
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Set up Node.js version
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{env.NODE_VERSION}}
+      - name: npm install and build
+        run: |
+          cd ${{env.AZURE_WEBAPP_PACKAGE_PATH}}
+          npm install
+          npm run build
+      - name: Upload To Azure Blob Storage
+        uses: bacongobbler/[email protected]
+        with:
+          source_dir: ${{env.AZURE_WEBAPP_PACKAGE_PATH}}/build
+          container_name: $web
+          connection_string: ${{secrets.BLOB_STORAGE_CONNECTION_STRING}}

.gitignore

@@ -117,3 +117,6 @@ DS_Store
 
 # ignore .vscode
 .vscode/
+
+package-lock.json
+

Automation/SQL/azureDeploy.json

@@ -1,90 +1,136 @@
 {
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-      "serverName": {
-          "type": "string",
-          "defaultValue": "[concat('nsc-sqlsrv-', resourceGroup().location, '-acbc')]",
-          "metadata": {
-              "description": "The name of the SQL logical server."
-          }
-      },
-      "location": {
-          "type": "string",
-          "defaultValue": "westus2",
-          "metadata": {
-              "description": "Location for all resources."
-          }
-      },
-      "administratorLogin": {
-          "type": "string",
-          "metadata": {
-              "description": "The administrator username of the SQL logical server."
-          }
-      },
-      "administratorLoginPassword": {
-          "type": "securestring",
-          "metadata": {
-              "description": "The administrator password of the SQL logical server."
-          }
-      },
-      "allowAzureIPs": {
-          "defaultValue": true,
-          "type": "bool",
-          "metadata": {
-              "description": "Allow Azure services to access server."
-          }
-      }
-  },
-  "variables": {},
-  "resources": [
-      {
-          "type": "Microsoft.Sql/servers",
-          "apiVersion": "2020-02-02-preview",
-          "name": "[parameters('serverName')]",
-          "location": "[parameters('location')]",
-          "properties": {
-              "administratorLogin": "[parameters('administratorLogin')]",
-              "administratorLoginPassword": "[parameters('administratorLoginPassword')]",
-              "version": "12.0",
-              "publicNetworkAccess": "Enabled"
-          }
-      },
+    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "serverName": {
+            "type": "string",
+            "defaultValue": "[concat('nsc-sqlsrv-dev-', resourceGroup().location, '-thursday')]",
+            "metadata": {
+                "description": "The name of the SQL logical server."
+            }
+        },
+        "location": {
+            "type": "string",
+            "defaultValue": "westus2",
+            "metadata": {
+                "description": "Location for all resources."
+            }
+        },
+        "administratorLogin": {
+            "type": "string",
+            "metadata": {
+                "description": "The administrator username of the SQL logical server."
+            }
+        },
+        "administratorLoginPassword": {
+            "type": "securestring",
+            "metadata": {
+                "description": "The administrator password of the SQL logical server."
+            }
+        },
+        "allowAzureIPs": {
+            "defaultValue": true,
+            "type": "bool",
+            "metadata": {
+                "description": "Allow Azure services to access server."
+            }
+        },
+        "sqlDBName": {
+            "type": "string",
+            "defaultValue": "[concat('nsc-sqldb-dev-', resourceGroup().location, '-thursday')]",
+            "metadata": {
+                "description": "The name of the SQL Database."
+            }
+        },
+        "createdBy": {
+            "type": "string",
+            "metadata": {
+                "description": "Indicate who is creating the resource."
+            }
+        },
+        "creatorsEmail": {
+            "type": "string",
+            "metadata": {
+                "description": "Indicate creator's email address."
+            }
+        },
+        "resourceTags": {
+            "type": "object",
+            "defaultValue": {
+                "NCSYear": 2021,
+                "NSCCohort": "Thursday",
+                "Owner": "[parameters('createdBy')]",
+                "OwnerEmail": "[parameters('creatorsEmail')]"
+            }
+        }
+    },
+    "variables": {},
+    "resources": [
         {
-            "type": "Microsoft.Sql/servers/auditingPolicies",
-            "apiVersion": "2014-04-01",
-            "name": "[concat(parameters('serverName'), '/Default')]",
+            "type": "Microsoft.Sql/servers",
+            "apiVersion": "2020-02-02-preview",
+            "name": "[parameters('serverName')]",
             "location": "[parameters('location')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Sql/servers', parameters('serverName'))]"
-            ],
+            "tags": "[parameters('resourceTags')]",
             "properties": {
-                "auditingState": "Disabled"
+                "administratorLogin": "[parameters('administratorLogin')]",
+                "administratorLoginPassword": "[parameters('administratorLoginPassword')]",
+                "version": "12.0",
+                "publicNetworkAccess": "Enabled"
             }
         },
         {
-            "type": "Microsoft.Sql/servers/firewallRules",
-            "condition": "[parameters('allowAzureIPs')]",
-            "apiVersion": "2015-05-01-preview",
-            "name": "[concat(parameters('serverName'), '/AllowAllWindowsAzureIps')]",
+            "type": "Microsoft.Sql/servers/databases",
+            "apiVersion": "2020-08-01-preview",
+            "name": "[concat(parameters('serverName'), '/', parameters('sqlDBName'))]",
+            "location": "[parameters('location')]",
+            "sku": {
+                "name": "Standard",
+                "tier": "Standard"
+            },
+            "tags": "[parameters('resourceTags')]",
             "dependsOn": [
                 "[resourceId('Microsoft.Sql/servers', parameters('serverName'))]"
-            ],
-            "properties": {
-                "startIpAddress": "0.0.0.0",
-                "endIpAddress": "0.0.0.0"
-            }
+            ]
         },
         {
-            "type": "Microsoft.Sql/servers/securityAlertPolicies",
-            "apiVersion": "2020-02-02-preview",
+            "type": "Microsoft.Sql/servers/auditingPolicies",
+            "apiVersion": "2014-04-01",
             "name": "[concat(parameters('serverName'), '/Default')]",
+            "location": "[parameters('location')]",
             "dependsOn": [
                 "[resourceId('Microsoft.Sql/servers', parameters('serverName'))]"
             ],
+            "tags": "[parameters('resourceTags')]",
             "properties": {
-                "state": "Enabled"
+                "auditingState": "Disabled"
             }
-        }
-  ]
-}
+        },
+          {
+              "type": "Microsoft.Sql/servers/firewallRules",
+              "condition": "[parameters('allowAzureIPs')]",
+              "apiVersion": "2015-05-01-preview",
+              "name": "[concat(parameters('serverName'), '/AllowAllWindowsAzureIps')]",
+              "dependsOn": [
+                  "[resourceId('Microsoft.Sql/servers', parameters('serverName'))]"
+              ],
+              "tags": "[parameters('resourceTags')]",
+              "properties": {
+                  "startIpAddress": "0.0.0.0",
+                  "endIpAddress": "0.0.0.0"
+              }
+          },
+          {
+              "type": "Microsoft.Sql/servers/securityAlertPolicies",
+              "apiVersion": "2020-02-02-preview",
+              "name": "[concat(parameters('serverName'), '/Default')]",
+              "dependsOn": [
+                  "[resourceId('Microsoft.Sql/servers', parameters('serverName'))]"
+              ],
+              "tags": "[parameters('resourceTags')]",
+              "properties": {
+                  "state": "Enabled"
+              }
+          }
+    ]
+  }

Automation/SQL/azureDeploy.ps1

@@ -1,19 +1,23 @@
 # Creates resource group and Azure SQL logical server
 
 param(
-        # Login parameters
-        [string] [Parameter(Mandatory=$true)] $tenantId,          
-        [string] [Parameter(Mandatory=$true)] $applicationId,
-        [string] [Parameter(Mandatory=$true)] $secret,
-        [string] [Parameter(Mandatory=$true)] $subscriptionId,
-        # Azure SQL server parameters
-        [string] [Parameter(Mandatory=$true)] $location,
-        [string] [Parameter(Mandatory=$true)] $resourceGroupName,
-        [string] [Parameter(Mandatory=$true)] $serverName,
-        [string] [Parameter(Mandatory=$true)] $administratorLogin,
-        [string] [Parameter(Mandatory=$true)] $administratorLoginPassword
+    # Login parameters
+    [string] [Parameter(Mandatory=$true)] $tenantId,          
+    [string] [Parameter(Mandatory=$true)] $applicationId,
+    [string] [Parameter(Mandatory=$true)] $secret,
+    [string] [Parameter(Mandatory=$true)] $subscriptionId,
+    # Azure SQL server parameters
+    [string] [Parameter(Mandatory=$true)] $location,
+    [string] [Parameter(Mandatory=$true)] $resourceGroupName,
+    [string] [Parameter(Mandatory=$true)] $serverName,
+    [string] [Parameter(Mandatory=$true)] $administratorLogin,
+    [string] [Parameter(Mandatory=$true)] $administratorLoginPassword,
+    # Azure SQL db parameters
+    [string] [Parameter(Mandatory=$false)] $sqlDBName,    
+    # Tag parameters
+    [string] [Parameter(Mandatory=$true)] $createdBy,
+    [string] [Parameter(Mandatory=$true)] $creatorsEmail              
 )
-
 [securestring] $administratorLoginPassword = ConvertTo-SecureString $administratorLoginPassword -AsPlainText -Force
 
 # Log in and set the SubscriptionId in which to create these objects
@@ -31,14 +35,15 @@ if (!$resourceGroupExists) {
         New-AzResourceGroup -Name $resourceGroupName -Location "$location" -Force
         Write-Host "Created resource group $resourceGroupName"
 } else {
-        Write-Host "Resource group already exists."
+        Write-Host "Resource group $resourceGroupName already exists."
 }
 
 # Deploy template
-Write-host "Creating primary server..."
+Write-host "Creating primary server and db..."
 New-AzResourceGroupDeployment -ResourceGroupName $resourceGroupName `
 -TemplateFile $pathToAzSqlTemplate -administratorLogin $administratorLogin `
--administratorLoginPassword $administratorLoginPassword
+-administratorLoginPassword $administratorLoginPassword -serverName $serverName `
+-sqlDBName $sqlDBName -location $location -createdBy $createdBy -creatorsEmail $creatorsEmail
 
 
 # Clear deployment