Rearrange Bicep Modules #548

jongio · 2022-08-29T22:02:18Z

Fixes #543

Right now all bicep is in resource.bicep. That file is getting long and we aren't sharing common bicep files amongst the templates.

Let's break into modules and structure better for reuse.

check-enforcer · 2022-09-02T21:07:31Z

This pull request is protected by Check Enforcer.

What is Check Enforcer?

Check Enforcer helps ensure all pull requests are covered by at least one check-run (typically an Azure Pipeline). When all check-runs associated with this pull request pass then Check Enforcer itself will pass.

Why am I getting this message?

You are getting this message because Check Enforcer did not detect any check-runs being associated with this pull request within five minutes. This may indicate that your pull request is not covered by any pipelines and so Check Enforcer is correctly blocking the pull request being merged.

What should I do now?

If the check-enforcer check-run is not passing and all other check-runs associated with this PR are passing (excluding license-cla) then you could try telling Check Enforcer to evaluate your pull request again. You can do this by adding a comment to this pull request as follows:
/check-enforcer evaluate
Typically evaulation only takes a few seconds. If you know that your pull request is not covered by a pipeline and this is expected you can override Check Enforcer using the following command:
/check-enforcer override

wbreza

This is looking really good so far. Excited for the day where we don't need to ask devs to author their own infra vs just pulling in different modules on demand from a module registry based on some azure.yaml configuration or similar.

Added some comments to consider for now or at a later stage.

templates/common/infra/bicep/core/host/container-registry.bicep

templates/common/infra/bicep/core/host/appserviceplan-functions.bicep

templates/common/infra/bicep/core/host/appserviceplan-sites.bicep

templates/common/infra/bicep/core/host/staticwebapp.bicep

templates/common/infra/bicep/core/storage/storage-account.bicep

templates/common/infra/bicep/core/host/container-app.bicep

templates/common/infra/bicep/core/host/appservice.bicep

ellismg

This seems much better than what we have today, so please don't consider this feedback blocking.

I think it is worthwhile to try to remove all the uses of dependsOn in favor of threading outputs from one resource/module as inputs to another resource/module. In practice, I think this means we just take a "name" parameter for external resources a module depends and using that in our existing calls instead of "knowing" what the name of the resource is.

I also feel strongly that we should be using camelCase outputs (just like our parameters) for all of these modules we are building, and only using SCREAMING_CASE in main.bicep and other "entrypoints", since these are the outputs that are written into .env and we want SCREAMING_CASE there.

Is your longer term plan to try to move these modules into a registry and just depend on them that way, or do you think we'll be shipping the source for these modules as part of the sample repositories?

templates/common/infra/bicep/core/database/cosmos-sql-db.bicep

templates/common/infra/bicep/core/database/cosmos-sql.bicep

templates/common/infra/bicep/core/database/sqlserver.bicep

templates/common/infra/bicep/core/host/appservice-config-cosmos.bicep

templates/common/infra/bicep/core/host/appservice.bicep

templates/common/infra/bicep/core/host/function-node.bicep

templates/common/infra/bicep/core/monitor/applicationinsights.bicep

azure-sdk · 2022-09-16T18:59:45Z

azd init -t Azure-Samples/todo-python-mongo -b pr/548

View Changes | Compare Changes

azure-sdk · 2022-09-16T19:31:19Z

Azure Dev CLI Install Instructions

Install scripts

MacOS/Linux

May elevate using sudo on some platforms and configurations

bash:

curl -fsSL https://azuresdkreleasepreview.blob.core.windows.net/azd/standalone/pr/548/uninstall-azd.sh | bash;
curl -fsSL https://azuresdkreleasepreview.blob.core.windows.net/azd/standalone/pr/548/install-azd.sh | bash -s -- --base-url https://azuresdkreleasepreview.blob.core.windows.net/azd/standalone/pr/548 --version '' --verbose

pwsh:

Invoke-RestMethod 'https://azuresdkreleasepreview.blob.core.windows.net/azd/standalone/pr/548/uninstall-azd.ps1' -OutFile uninstall-azd.ps1; ./uninstall-azd.ps1
Invoke-RestMethod 'https://azuresdkreleasepreview.blob.core.windows.net/azd/standalone/pr/548/install-azd.ps1' -OutFile install-azd.ps1; ./install-azd.ps1 -BaseUrl 'https://azuresdkreleasepreview.blob.core.windows.net/azd/standalone/pr/548' -Version '' -Verbose

Windows

powershell -c "Set-ExecutionPolicy Bypass Process; irm 'https://azuresdkreleasepreview.blob.core.windows.net/azd/standalone/pr/548/uninstall-azd.ps1' > uninstall-azd.ps1; ./uninstall-azd.ps1;"
powershell -c "Set-ExecutionPolicy Bypass Process; irm 'https://azuresdkreleasepreview.blob.core.windows.net/azd/standalone/pr/548/install-azd.ps1' > install-azd.ps1; ./install-azd.ps1 -BaseUrl 'https://azuresdkreleasepreview.blob.core.windows.net/azd/standalone/pr/548' -Version '' -Verbose;"

Standalone Binary

Container

docker run -it azdevcliextacr.azurecr.io/azure-dev:pr-548

jongio requested review from hattan and HadwaAbdelhalem August 29, 2022 22:03

rajeshkamal5050 assigned jongio Aug 30, 2022

jongio mentioned this pull request Aug 30, 2022

Move bicep to modules #485

Closed

jongio force-pushed the bicepreorg branch from f5c01aa to 0459d03 Compare September 1, 2022 22:00

jongio force-pushed the bicepreorg branch 2 times, most recently from 9e12996 to c1fa359 Compare September 8, 2022 17:22

wbreza reviewed Sep 11, 2022

View reviewed changes

jongio force-pushed the bicepreorg branch from 4bfc22e to 1a08e77 Compare September 12, 2022 20:41

jongio marked this pull request as ready for review September 13, 2022 15:38

jongio requested review from ellismg, vhvb1989, hemarina and weikanglim as code owners September 13, 2022 15:38

jongio force-pushed the bicepreorg branch from f6869fd to 0f758c6 Compare September 13, 2022 16:01

ellismg reviewed Sep 13, 2022

View reviewed changes

wbreza approved these changes Sep 14, 2022

View reviewed changes

jongio and others added 12 commits September 15, 2022 10:27

Update nodejs-mongo first

a4b3ec1

Update paths to applicationinsights.bicep

bd936ae

Update aca template

138d55d

Update python/appservice

9c5cfef

Adding csharp-cosmos-sql

db89e4d

Adding Rewrite rules for cosmos csharp sql

bd16efe

Fix naming

47fad0c

Use string

75b22b5

Refactor cosmos-sql

b4dfe4f

Tweak cosmos-sql

4fded36

Refactor cosmos-sql

b67baf7

Add wwwroot

7558113

jongio added 20 commits September 15, 2022 10:27

Add csharp-sql and csharp-cosmos-sql

8aaa76c

add python

4cfbe84

Funcs and containerapps

034cb6c

Fix aca

60a08ba

Sku params

4e88027

Fix up tests

b6ffcb7

Fix bad yaml

33eeb91

Fix bad yaml

9a0092a

Fix bad yaml

54e16b4

Clean up. Clean up. Everybody everywhere

03fe0fe

Camel and clean up

063f1d5

Fix uri refs

2c1a91b

Fix apiName

ff1fade

Fix outputs and module names

55972f9

Change python appservice to scm true

fc04291

Fix python and dotnet names

89891da

Rename function to functions. Update names

06eb70b

Fix output

caabce7

Update deployment names

65b6583

Fix up repo.yamls

c3697bd

jongio force-pushed the bicepreorg branch from 78ac464 to c3697bd Compare September 15, 2022 17:41

jongio added 5 commits September 15, 2022 11:53

Add azd core modules

f71b2a1

all caps in main/resources and app and fix aca

e524dde

Update config case

49c648f

Finishing touches

21680d3

Fix rename path

3df3633

jongio merged commit fd16d99 into Azure:main Sep 16, 2022

jongio deleted the bicepreorg branch September 16, 2022 19:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rearrange Bicep Modules #548

Rearrange Bicep Modules #548

jongio commented Aug 29, 2022

check-enforcer bot commented Sep 2, 2022

wbreza left a comment

ellismg left a comment

azure-sdk commented Sep 16, 2022

azure-sdk commented Sep 16, 2022

Rearrange Bicep Modules #548

Rearrange Bicep Modules #548

Conversation

jongio commented Aug 29, 2022

check-enforcer bot commented Sep 2, 2022

What is Check Enforcer?

Why am I getting this message?

What should I do now?

wbreza left a comment

Choose a reason for hiding this comment

ellismg left a comment

Choose a reason for hiding this comment

azure-sdk commented Sep 16, 2022

Repoman Generation Results

Project: todo-csharp-cosmos-sql

Remote: azure-samples-staging

Branch: pr/548

Project: todo-csharp-sql

Remote: azure-samples-staging

Branch: pr/548

Project: todo-nodejs-mongo-aca

Remote: azure-samples-staging

Branch: pr/548

Project: todo-nodejs-mongo-swa-func

Remote: azure-samples-staging

Branch: pr/548

Project: todo-nodejs-mongo

Remote: azure-samples-staging

Branch: pr/548

Project: todo-python-mongo-aca

Remote: azure-samples-staging

Branch: pr/548

Project: todo-python-mongo-swa-func

Remote: azure-samples-staging

Branch: pr/548

Project: todo-python-mongo

Remote: azure-samples-staging

Branch: pr/548

azure-sdk commented Sep 16, 2022

Azure Dev CLI Install Instructions

Install scripts

MacOS/Linux

Windows

Standalone Binary

Container