Merge pull request #2 from JimacoMS4/try-flask-azd

Aligned azd infra with flask, removed src/tests
bobtabor · Jul 16, 2024 · ee34b2a · ee34b2a
2 parents 35cbc52 + 3a3eb71
commit ee34b2a
Show file tree

Hide file tree

Showing 44 changed files with 429 additions and 1,812 deletions.
diff --git a/.gitignore b/.gitignore
@@ -240,3 +240,6 @@ Thumbs.db #thumbnail cache on Windows
 
 # Azure Developer CLI
 .azure/
+
+# Azurite stuff
+__azurite_*.json
diff --git a/infra/README.md b/infra/README.md
@@ -0,0 +1,3 @@
+# infra directory
+
+This `infra` directory contains azd files used for `azd provision` and isn't used by the sample application.
diff --git a/...nitor/applicationinsights-dashboard.bicep → infra/appinsights.bicep b/...nitor/applicationinsights-dashboard.bicep → infra/appinsights.bicep
@@ -1,12 +1,22 @@
-metadata description = 'Creates a dashboard for an Application Insights instance.'
-param name string
-param applicationInsightsName string
-param location string = resourceGroup().location
-param tags object = {}
+param prefix string
+param location string
+param tags object
+param workspaceId string
+
+resource applicationInsights 'Microsoft.Insights/components@2020-02-02' = {
+  name: '${prefix}-appinsights'
+  location: location
+  tags: tags
+  kind: 'web'
+  properties: {
+    Application_Type: 'web'
+    WorkspaceResourceId: workspaceId
+  }
+}
 
 // 2020-09-01-preview because that is the latest valid version
 resource applicationInsightsDashboard 'Microsoft.Portal/dashboards@2020-09-01-preview' = {
-  name: name
+  name: '${prefix}-dashboard'
   location: location
   tags: tags
   properties: {
@@ -1231,6 +1241,4 @@ resource applicationInsightsDashboard 'Microsoft.Portal/dashboards@2020-09-01-pr
   }
 }
 
-resource applicationInsights 'Microsoft.Insights/components@2020-02-02' existing = {
-  name: applicationInsightsName
-}
+output APPLICATIONINSIGHTS_CONNECTION_STRING string = applicationInsights.properties.ConnectionString
diff --git a/infra/core/database/cosmos/cosmos-account.bicep b/infra/core/database/cosmos/cosmos-account.bicep
diff --git a/infra/core/database/cosmos/cosmos-pg-adapter.bicep b/infra/core/database/cosmos/cosmos-pg-adapter.bicep
diff --git a/infra/core/database/cosmos/mongo/cosmos-mongo-account.bicep b/infra/core/database/cosmos/mongo/cosmos-mongo-account.bicep
diff --git a/infra/core/database/cosmos/mongo/cosmos-mongo-db.bicep b/infra/core/database/cosmos/mongo/cosmos-mongo-db.bicep
diff --git a/infra/core/database/cosmos/sql/cosmos-sql-account.bicep b/infra/core/database/cosmos/sql/cosmos-sql-account.bicep
diff --git a/infra/core/database/cosmos/sql/cosmos-sql-db.bicep b/infra/core/database/cosmos/sql/cosmos-sql-db.bicep
diff --git a/infra/core/database/cosmos/sql/cosmos-sql-role-assign.bicep b/infra/core/database/cosmos/sql/cosmos-sql-role-assign.bicep
diff --git a/infra/core/database/cosmos/sql/cosmos-sql-role-def.bicep b/infra/core/database/cosmos/sql/cosmos-sql-role-def.bicep
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# infra directory

		This `infra` directory contains azd files used for `azd provision` and isn't used by the sample application.