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: Fix malformed json from arch def template #57

Merged
merged 1 commit into from
Nov 1, 2024

Conversation

sdeguchi
Copy link
Collaborator

@sdeguchi sdeguchi commented Oct 31, 2024

Overview/Summary

Replace this with a brief description of what this Pull Request fixes, changes, etc.

This PR fixes/adds/changes/removes

  1. Templated file contents could have malformed json due hard-coded archetypes in the template file.

Breaking Changes

  1. Removing non ALZ archetypes from being included via templating. Non ALZ archetypes must be hardcoded into the architecture definition template.

Testing Evidence

image

As part of this Pull Request I have

  • Checked for duplicate Pull Requests
  • Associated it with relevant issues, for tracking and closure.
  • Ensured my code/branch is up-to-date with the latest changes in the main branch
  • Performed testing and provided evidence.
  • Updated relevant and associated documentation.

@sdeguchi sdeguchi force-pushed the feature-update-confidential-archetypes branch from a2279c2 to 41f8beb Compare October 31, 2024 21:59
Copy link
Member

@jaredfholgate jaredfholgate left a comment

Choose a reason for hiding this comment

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

LGTM.

Perhaps can be improved in the future?

Using jsondecode and jsonencode may help here?

@jaredfholgate jaredfholgate merged commit 0fc9846 into main Nov 1, 2024
8 checks passed
@jaredfholgate jaredfholgate deleted the feature-update-confidential-archetypes branch November 1, 2024 11:11
VeronicaSea pushed a commit to Azure/sovereign-landing-zone that referenced this pull request Jan 10, 2025
<!-- Thank you for submitting a Pull Request. Please fill out the template below.-->
# Overview/Summary

Updates the assignment of the FSI archetypes, fixes issues in

## This PR fixes/adds/changes/removes

1. Updates archetype assignment of the confidential policies
2. Fixes gateway configuration variables

### Breaking Changes

1. Depends on Azure/accelerator-bootstrap-modules#57 or duplicate archetype assignment will occur.

## Testing Evidence

![image.png](https://msazure.visualstudio.com/b32aa71e-8ed2-41b2-9d77-5bc261222004/_apis/git/repositories/db989a04-e1c1-443f-9a75-7f9ddf4d86f9/pullRequests/11182773/attachments/image.png)

# Documentation

Related wiki link or design document, if applicable.

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup and enhancement of policy assignments for FSI.

#### PR Summary
This pull request updates the FSI archetypes by removing duplicate policy assignments and refining configurations.
- `/internal/terraform/Azure-Landing-Zones-Library/platform/fsi/policy_assignments/sd_01_allowed_services.alz_policy_assignment.json`: Removed extensive lists of allowed SKUs and resource types, setting them to empty arrays.
- `/internal/terraform/alz-terraform-accelerator/templates/microsoft_cloud_for_industry/microsoft_cloud_for_financial_services/variables.tf`: Added `gatewayType` and corrected `vpnType` in `express_route_gateway_config` and `vpn_gateway_config` objects.
- `/internal/terraform/alz-terraform-accelerator/templates/microsoft_cloud_for_industry/modules/platform/variables.tf`: Similar updates as above, adding `gatewayType` and correcting `vpnType`.
- `/internal/terraform/alz-terraform-accelerator/templates/microsoft_cloud_for_industry/microsoft_cloud_for_financial_services/templates/fsi.alz_architecture_definition.json.tftpl`: Updated archetypes to include `so_04_cmk` and `so_01_data_residency` in the root management group and removed them from confidential groups.

Related work items: #30083854
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants