updates to make bicep more dyanmic

Author: Kendall Roden

.github/workflows/build.yaml

@@ -2,9 +2,9 @@
 name: Build and Deploy
 on:
  push:
- branches: [ main ]
+ branches: [main]
  # Publish semver tags as releases.
- tags: [ 'v*.*.*' ]
+ tags: ["v*.*.*"]
  workflow_dispatch:
 
 env:
@@ -16,7 +16,12 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- services: [ {'imageName': 'node-service', 'directory': './node-service'}, {'imageName': 'python-service', 'directory': './python-service'} , {'imageName': 'go-service', 'directory': './go-service'} ]
+ services:
+ [
+ { "imageName": "node-service", "directory": "./node-service" },
+ { "imageName": "python-service", "directory": "./python-service" },
+ { "imageName": "go-service", "directory": "./go-service" },
+ ]
  permissions:
  contents: read
  packages: write
@@ -51,7 +56,7 @@ jobs:
  type=semver,pattern={{major}}
  type=ref,event=branch
  type=sha
- 
+
  # Build and push Docker image with Buildx (don't push on PR)
  # https://github.com/docker/build-push-action
  - name: Build and push Docker image
@@ -61,18 +66,18 @@ jobs:
  push: ${{ github.event_name != 'pull_request' }}
  tags: ${{ steps.meta.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
- 
+
  - name: Output image tag
  id: image-tag
  run: echo "::set-output name=image-${{ matrix.services.imageName }}::${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ matrix.services.imageName }}:sha-$(git rev-parse --short HEAD)" | tr '[:upper:]' '[:lower:]'
- 
+
  deploy:
  runs-on: ubuntu-latest
  needs: [build]
  steps:
  - name: Checkout repository
  uses: actions/checkout@v2
- 
+
  - name: Azure Login
  uses: azure/login@v1
  with:
@@ -88,13 +93,11 @@ jobs:
  minReplicas=0 \
  nodeImage='${{ needs.build.outputs.containerImage-node }}' \
  nodePort=3000 \
- isNodeExternalIngress=true \
  pythonImage='${{ needs.build.outputs.containerImage-python }}' \
  pythonPort=5000 \
- isPythonExternalIngress=false \
  goImage='${{ needs.build.outputs.containerImage-go }}' \
  goPort=8050 \
- isGoExternalIngress=false \
  containerRegistry=${{ env.REGISTRY }} \
  containerRegistryUsername=${{ github.actor }} \
- containerRegistryPassword=${{ secrets.PACKAGES_TOKEN }}
+ containerRegistryPassword=${{ secrets.PACKAGES_TOKEN }} \
+ deployApim = true

README.md

@@ -1,93 +1,62 @@
 param containerAppName string
-param location string = resourceGroup().location
-param environmentId string
+param location string 
+param environmentName string 
 param containerImage string
 param containerPort int
 param isExternalIngress bool
 param containerRegistry string
 param containerRegistryUsername string
-param env array = []
+param isPrivateRegistry bool
+param enableIngress bool 
+param registryPassword string
 param minReplicas int = 0
-param secrets array = [
- {
- name: 'docker-password'
- value: containerRegistryPassword
- }
-]
-
-@allowed([
- 'multiple'
- 'single'
-])
-param revisionMode string = 'multiple'
+param secrets array = []
+param env array = []
 
-@secure()
-param containerRegistryPassword string
 
-var cpu = json('0.5')
-var memory = '500Mi'
-var registrySecretRefName = 'docker-password'
+resource environment 'Microsoft.App/managedEnvironments@2022-01-01-preview' existing = {
+ name: environmentName
+}
 
 resource containerApp 'Microsoft.App/containerApps@2022-01-01-preview' = {
  name: containerAppName
  location: location
  properties: {
- managedEnvironmentId: environmentId
+ managedEnvironmentId: environment.id
  configuration: {
- // activeRevisionsMode: revisionMode
  secrets: secrets
- registries: [
+ registries: isPrivateRegistry ? [
  {
  server: containerRegistry
  username: containerRegistryUsername
- passwordSecretRef: registrySecretRefName
+ passwordSecretRef: registryPassword
  }
- ]
- ingress: {
+ ] : null
+ ingress: enableIngress ? {
  external: isExternalIngress
  targetPort: containerPort
  transport: 'auto'
- // traffic: [
- // {
- // weight: 100
- // latestRevision: true
- // }
- // ]
- }
+ } : null
  dapr: {
  enabled: true
  appPort: containerPort
  appId: containerAppName
  }
  }
  template: {
- // revisionSuffix: 'somevalue'
  containers: [
  {
  image: containerImage
  name: containerAppName
  env: env
- // resources: {
- // cpu: cpu
- // memory: memory
- // }
  }
  ]
  scale: {
  minReplicas: minReplicas
- // maxReplicas: 10
- // rules: [{
- // name: 'httpscale'
- // http: {
- // metadata: {
- // concurrentRequests: 100
- // }
- // }
- // }
- // ]
+ maxReplicas: 1
  }
  }
  }
 }
 
-output fqdn string = containerApp.properties.configuration.ingress.fqdn
+output fqdn string = enableIngress ? containerApp.properties.configuration.ingress.fqdn : 'Ingress not enabled'

deploy/container-http.bicep

@@ -2,10 +2,10 @@
 param accountName string = 'cosmos-${uniqueString(resourceGroup().id)}'
 
 @description('Location for the Cosmos DB account.')
-param location string = resourceGroup().location
+param location string
 
 @description('The primary replica region for the Cosmos DB account.')
-param primaryRegion string = resourceGroup().location
+param primaryRegion string
 
 @description('The default consistency level of the Cosmos DB account.')
 @allowed([

deploy/cosmosdb.bicep

@@ -1,7 +1,7 @@
 param environmentName string
-param logAnalyticsWorkspaceName string = 'logs-${environmentName}'
-param appInsightsName string = 'appins-${environmentName}'
-param location string = resourceGroup().location
+param logAnalyticsWorkspaceName string
+param appInsightsName string
+param location string
 
 resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2020-03-01-preview' = {
  name: logAnalyticsWorkspaceName
@@ -17,31 +17,32 @@ resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2020-03
  })
 }
 
-resource appInsights 'Microsoft.Insights/components@2020-02-02-preview' = {
+
+resource appInsights 'Microsoft.Insights/components@2020-02-02' = {
  name: appInsightsName
  location: location
  kind: 'web'
- properties: { 
+ properties: {
  Application_Type: 'web'
- Flow_Type: 'Redfield'
- Request_Source: 'CustomDeployment'
+ WorkspaceResourceId:logAnalyticsWorkspace.id
  }
 }
 
 resource environment 'Microsoft.App/managedEnvironments@2022-01-01-preview' = {
  name: environmentName
  location: location
  properties: {
+ daprAIInstrumentationKey:appInsights.properties.InstrumentationKey
  appLogsConfiguration: {
  destination: 'log-analytics'
  logAnalyticsConfiguration: {
  customerId: logAnalyticsWorkspace.properties.customerId
  sharedKey: logAnalyticsWorkspace.listKeys().primarySharedKey
  }
  }
- daprAIInstrumentationKey: appInsights.properties.InstrumentationKey
  }
 }
 
+
 output location string = location
 output environmentId string = environment.id