Skip to content

Add python-mongo template terraform - #532

Merged
HadwaAbdelhalem merged 35 commits into
Azure:mainfrom
kaizentm:cse/add-template-terraform
Sep 2, 2022
Merged

Add python-mongo template terraform#532
HadwaAbdelhalem merged 35 commits into
Azure:mainfrom
kaizentm:cse/add-template-terraform

Conversation

@HadwaAbdelhalem

@HadwaAbdelhalem HadwaAbdelhalem commented Aug 26, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor

this PR adds the terraform modules code for todo-python-mongo template by adding :

  • Python-mongo infra terraform code.
  • application-insights, a common infra module, terraform code.
  • repo.yaml, and azure.yaml config files for the template repo generation.

➡Note : Target template remote to be created Azure-Samples/todo-python-mongo-terraform

➡Note : The generated template has a dependency on this issue being addressed rewrite module path normalization .

fixes #232

hattan and others added 23 commits August 3, 2022 12:09
@hattan
adding in cse fork changes
528f9ad
@hattan
adding vscode debugging support
60a463b
@hattan
adding .tmp folder to gitignore
68e6947
@hattan
refator to support bicep in folder structure
362572c
@HadwaAbdelhalem
update repoman to add new rule to copy specific files, update repoman…
3d18273 
… list to match wider pattern repo*.yaml, refactor infra to infra/bicep in common, and common/projects
@HadwaAbdelhalem @hattan
add aca/bicep layer in common infra folders
f2152c3 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem @hattan
update to set -t to the project template
bb37d8a 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem @hattan
update node-js-mongo project
6e115b0 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem @hattan
update repo.yaml files to reference common/infra/bicep
222007b 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@hattan @HadwaAbdelhalem
Removing extra lines in python-mongo azure*.yaml files.
de0f308 
Co-authored-by: Hadwa Gaber <hadwaa@microsoft.com>
@HadwaAbdelhalem
Code Cleanup
c1b9754 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem @hattan
redirect configurations to upstream azure/azure-dev
d3fb35d 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem @hattan
address bicep lint failures
ec30798 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem @hattan
Update todo-project template.
dd99040 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem
Merge remote-tracking branch 'upstream/main' into cse/restructure-inf…
f38bf69 
…ra-folders
@HadwaAbdelhalem @hattan
fix asset rules for path rewitre
861e34a 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem @hattan
Add rewrite path rules tmp fix
9e1fa5a 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem
add python-mongo, application insights terraform modules
c0657b3
@HadwaAbdelhalem
add repo.yml, azure.yml files
616f1a0
@HadwaAbdelhalem
fix asset rules
6e0cb75
@HadwaAbdelhalem @hattan
ignore terraform files
f7d4c4b 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem
merge upstream main
1e4730c
@HadwaAbdelhalem @hattan
update remote main and staging urls
5d139d8 
Co-authored-by: Hattan Shobokshi <hattan.shobokshi@microsoft.com>
@HadwaAbdelhalem HadwaAbdelhalem changed the title add python-mongo template terraform Add python-mongo template terraform Aug 26, 2022
@HadwaAbdelhalem HadwaAbdelhalem linked an issue Aug 26, 2022 that may be closed by this pull request
Terraform support for todo-python-mongo template #232
Closed
2 tasks
@HadwaAbdelhalem
HadwaAbdelhalem requested a review from hattan August 26, 2022 20:17
@HadwaAbdelhalem HadwaAbdelhalem self-assigned this Aug 26, 2022
wbreza
wbreza reviewed Aug 27, 2022
View reviewed changes

@wbreza wbreza left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good so far - added a few comments.

Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/main.tf Outdated
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/main.tf Outdated
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/provider.tf Outdated
@hattan hattan mentioned this pull request Aug 28, 2022
Merged
jongio
jongio reviewed Aug 29, 2022
View reviewed changes
Comment thread templates/common/infra/terraform/applicationinsights.tf
Comment thread templates/common/infra/terraform/applicationinsights_variables.tf
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/apps.tf
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/variables.tf Outdated
jongio
jongio reviewed Aug 29, 2022
View reviewed changes
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/database.tf
jongio
jongio reviewed Aug 29, 2022
View reviewed changes
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/database.tf
jongio
jongio reviewed Aug 29, 2022
View reviewed changes
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/keyvault.tf
jongio
jongio reviewed Aug 29, 2022
View reviewed changes
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/main.tf
@karolz-ms

karolz-ms commented Aug 30, 2022

Copy link
Copy Markdown
Contributor

@HadwaAbdelhalem are you planning to add launch.json and tasks.json files for local development?

We might want to reuse them between this template and the Bicep-based one. This would require moving them to a shared folder.

wbreza
wbreza reviewed Aug 30, 2022
View reviewed changes

@wbreza wbreza left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking great - a few more comments around the appinsights module.

Comment thread templates/common/infra/terraform/applicationinsights.tf
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/loganalytics.tf
Comment thread templates/todo/projects/python-mongo/.repo/terraform/infra/main.tf Outdated
@HadwaAbdelhalem

HadwaAbdelhalem commented Sep 1, 2022

Copy link
Copy Markdown
Contributor Author

@HadwaAbdelhalem are you planning to add launch.json and tasks.json files for local development?

We might want to reuse them between this template and the Bicep-based one. This would require moving them to a shared folder.

@karolz-ms , I had them in a previous PR. and received feedback to exclude them as they are specific tothe todo-apps 60a463b

ellismg
ellismg reviewed Sep 1, 2022
View reviewed changes
Comment thread templates/todo/projects/python-mongo/.repo/terraform/azure.yaml
wbreza
wbreza approved these changes Sep 1, 2022
View reviewed changes

@wbreza wbreza left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking great, thank you!

Comment thread templates/todo/projects/python-mongo/.repo/terraform/azure.yaml
Comment thread templates/todo/projects/python-mongo/.repo/terraform/azure.yaml
@karolz-ms

karolz-ms commented Sep 1, 2022

Copy link
Copy Markdown
Contributor

@HadwaAbdelhalem are you planning to add launch.json and tasks.json files for local development?
We might want to reuse them between this template and the Bicep-based one. This would require moving them to a shared folder.

@karolz-ms , I had them in a previous PR. and received feedback to exclude them as they are specific tothe todo-apps 60a463b

@HadwaAbdelhalem and I synced offline. The VS Code files will be included automatically as part of template generation; and the files that we have for Python-Mongo flavor of the ToDo app will work unchanged.

@azure-sdk

azure-sdk commented Sep 2, 2022

Copy link
Copy Markdown
Collaborator

Repoman Generation Results

Repoman pushed changes to remotes for the following projects:

Project: todo-python-mongo-terraform

Remote: azure-samples-staging

Branch: pr/532

You can initialize this project with:

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

View Changes | Compare Changes

@HadwaAbdelhalem HadwaAbdelhalem linked an issue Sep 2, 2022 that may be closed by this pull request
Terraform python mongo template resource token seed #574
Closed
@HadwaAbdelhalem HadwaAbdelhalem removed a link to an issue Sep 2, 2022
Terraform python mongo template resource token seed #574
Closed
@HadwaAbdelhalem
HadwaAbdelhalem merged commit 30f66b9 into Azure:main Sep 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hattan hattan Awaiting requested review from hattan
@ellismg ellismg Awaiting requested review from ellismg
2 more reviewers
@jongio jongio jongio left review comments
@wbreza wbreza wbreza approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@HadwaAbdelhalem HadwaAbdelhalem

Labels

None yet

Projects

None yet

Milestone

Release 0.2

Development

Successfully merging this pull request may close these issues.

Terraform support for todo-python-mongo template

7 participants

@HadwaAbdelhalem @karolz-ms @azure-sdk @jongio @wbreza @ellismg @hattan