Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Updated module name from avm/ptn/azd/container-apps to avm/ptn/azd/container-apps-stack #3452

Merged
merged 2 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#/avm/ptn/avd-lza/networking/ @Azure/avm-ptn-avd-lza-networking-module-owners-bicep @Azure/avm-module-reviewers-bicep
#/avm/ptn/avd-lza/session-hosts/ @Azure/avm-ptn-avd-lza-sessionhosts-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/azd/apim-api/ @Azure/avm-ptn-azd-apimapi-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/azd/container-apps/ @Azure/avm-ptn-azd-containerapps-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/azd/container-apps-stack/ @Azure/avm-ptn-azd-containerappsstack-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/azd/insights-dashboard/ @Azure/avm-ptn-azd-insightsdashboard-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/deployment-script/import-image-to-acr/ @Azure/avm-ptn-deploymentscript-importimagetoacr-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/dev-ops/cicd-agents-and-runners/ @Azure/avm-ptn-devops-cicdagentsandrunners-module-owners-bicep @Azure/avm-module-reviewers-bicep
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/avm_module_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ body:
# - "avm/ptn/avd-lza/networking"
# - "avm/ptn/avd-lza/session-hosts"
- "avm/ptn/azd/apim-api"
- "avm/ptn/azd/container-apps"
- "avm/ptn/azd/container-apps-stack"
- "avm/ptn/azd/insights-dashboard"
- "avm/ptn/deployment-script/import-image-to-acr"
- "avm/ptn/dev-ops/cicd-agents-and-runners"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "avm.ptn.azd.container-apps"
name: "avm.ptn.azd.container-apps-stack"

on:
workflow_dispatch:
Expand Down Expand Up @@ -28,15 +28,15 @@ on:
paths:
- ".github/actions/templates/avm-**"
- ".github/workflows/avm.template.module.yml"
- ".github/workflows/avm.ptn.azd.container-apps.yml"
- "avm/ptn/azd/container-apps/**"
- ".github/workflows/avm.ptn.azd.container-apps-stack.yml"
- "avm/ptn/azd/container-apps-stack/**"
- "avm/utilities/pipelines/**"
- "!avm/utilities/pipelines/platform/**"
- "!*/**/README.md"

env:
modulePath: "avm/ptn/azd/container-apps"
workflowPath: ".github/workflows/avm.ptn.azd.container-apps.yml"
modulePath: "avm/ptn/azd/container-apps-stack"
workflowPath: ".github/workflows/avm.ptn.azd.container-apps-stack.yml"

concurrency:
group: ${{ github.workflow }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# avm/ptn/azd/container-apps `[Azd/ContainerApps]`
# avm/ptn/azd/container-apps-stack `[Azd/ContainerAppsStack]`

Creates an Azure Container Registry and an Azure Container Apps environment.

**Note:** This module is not intended for broad, generic use, as it was designed to cater for the requirements of the AZD CLI product. Feature requests and bug fix requests are welcome if they support the development of the AZD CLI but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case

## Navigation

- [Resource Types](#Resource-Types)
Expand Down Expand Up @@ -35,7 +37,7 @@ The following section provides usage examples for the module, which were used to

>**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.

>**Note**: To reference the module, please use the following syntax `br/public:avm/ptn/azd/container-apps:<version>`.
>**Note**: To reference the module, please use the following syntax `br/public:avm/ptn/azd/container-apps-stack:<version>`.

- [With zoneRedundant enabled](#example-1-with-zoneredundant-enabled)

Expand All @@ -49,12 +51,12 @@ This instance deploys the module with zoneRedundant enabled.
<summary>via Bicep module</summary>

```bicep
module containerApps 'br/public:avm/ptn/azd/container-apps:<version>' = {
name: 'containerAppsDeployment'
module containerAppsStack 'br/public:avm/ptn/azd/container-apps-stack:<version>' = {
name: 'containerAppsStackDeployment'
params: {
// Required parameters
containerAppsEnvironmentName: 'acazrcae001'
containerRegistryName: 'acazrcr001'
containerAppsEnvironmentName: 'acaszrcae001'
containerRegistryName: 'acaszrcr001'
logAnalyticsWorkspaceResourceId: '<logAnalyticsWorkspaceResourceId>'
// Non-required parameters
acrSku: 'Standard'
Expand Down Expand Up @@ -92,10 +94,10 @@ module containerApps 'br/public:avm/ptn/azd/container-apps:<version>' = {
"parameters": {
// Required parameters
"containerAppsEnvironmentName": {
"value": "acazrcae001"
"value": "acaszrcae001"
},
"containerRegistryName": {
"value": "acazrcr001"
"value": "acaszrcr001"
},
"logAnalyticsWorkspaceResourceId": {
"value": "<logAnalyticsWorkspaceResourceId>"
Expand Down Expand Up @@ -150,11 +152,11 @@ module containerApps 'br/public:avm/ptn/azd/container-apps:<version>' = {
<summary>via Bicep parameters file</summary>

```bicep-params
using 'br/public:avm/ptn/azd/container-apps:<version>'
using 'br/public:avm/ptn/azd/container-apps-stack:<version>'

// Required parameters
param containerAppsEnvironmentName = 'acazrcae001'
param containerRegistryName = 'acazrcr001'
param containerAppsEnvironmentName = 'acaszrcae001'
param containerRegistryName = 'acaszrcr001'
param logAnalyticsWorkspaceResourceId = '<logAnalyticsWorkspaceResourceId>'
// Non-required parameters
param acrSku = 'Standard'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
metadata name = 'avm/ptn/azd/container-apps'
metadata description = 'Creates an Azure Container Registry and an Azure Container Apps environment.'
metadata name = 'avm/ptn/azd/container-apps-stack'
metadata description = '''Creates an Azure Container Registry and an Azure Container Apps environment.

**Note:** This module is not intended for broad, generic use, as it was designed to cater for the requirements of the AZD CLI product. Feature requests and bug fix requests are welcome if they support the development of the AZD CLI but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case'''
metadata owner = 'Azure/module-maintainers'

@description('Optional. Location for all Resources.')
Expand Down Expand Up @@ -68,7 +70,7 @@ param infrastructureResourceGroupName string = take('ME_${containerAppsEnvironme

#disable-next-line no-deployments-resources
resource avmTelemetry 'Microsoft.Resources/deployments@2023-07-01' = if (enableTelemetry) {
name: '46d3xbcp.ptn.azd-containerapps.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'
name: '46d3xbcp.ptn.azd-containerappsstack.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'
properties: {
mode: 'Incremental'
template: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "3154922260961626340"
"version": "0.29.47.4906",
"templateHash": "332940780345983600"
},
"name": "avm/ptn/azd/container-apps",
"description": "Creates an Azure Container Registry and an Azure Container Apps environment.",
"name": "avm/ptn/azd/container-apps-stack",
"description": "Creates an Azure Container Registry and an Azure Container Apps environment.\n\n**Note:** This module is not intended for broad, generic use, as it was designed to cater for the requirements of the AZD CLI product. Feature requests and bug fix requests are welcome if they support the development of the AZD CLI but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case",
"owner": "Azure/module-maintainers"
},
"parameters": {
Expand Down Expand Up @@ -154,7 +154,7 @@
"condition": "[parameters('enableTelemetry')]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2023-07-01",
"name": "[format('46d3xbcp.ptn.azd-containerapps.{0}.{1}', replace('-..--..-', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]",
"name": "[format('46d3xbcp.ptn.azd-containerappsstack.{0}.{1}', replace('-..--..-', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]",
"properties": {
"mode": "Incremental",
"template": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ metadata description = 'This instance deploys the module with zoneRedundant enab
// ========== //
@description('Optional. The name of the resource group to deploy for testing purposes.')
@maxLength(90)
param resourceGroupName string = 'dep-${namePrefix}-container-apps-${serviceShort}-rg'
param resourceGroupName string = 'dep-${namePrefix}-container-apps-stack-${serviceShort}-rg'

@description('Optional. The location to deploy resources to.')
param resourceLocation string = deployment().location

@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
param serviceShort string = 'acazr'
param serviceShort string = 'acaszr'

@description('Optional. A token to inject into the name of each resource.')
param namePrefix string = '#_namePrefix_#'
Expand Down