feat: WAF Implementation for CKM#593
Merged
Roopan-Microsoft merged 46 commits intomainfrom Sep 18, 2025
Merged
Conversation
…ult configuration
…just SKU settings, and remove sql elastic pool
…project resource ID in configuration files
…igurations for DFS and streamline deployment script parameters
feat: Merging the AVM WAF changes into dev
ci: update image tag to latest_waf
Harsh-Microsoft
requested review from
Avijit-Microsoft,
Prajwal-Microsoft,
Roopan-Microsoft,
Vinay-Microsoft,
aniaroramsft and
brittneek
as code owners
chore: update allowed regions and baseURL
Roopan-Microsoft
approved these changes
Sep 18, 2025
Contributor
|
🎉 This PR is included in version 3.14.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
This pull request introduces significant improvements to the deployment configuration, parameterization, and documentation for the solution accelerator. The primary focus is on aligning with Azure Well-Architected Framework (WAF) best practices, enhancing environment flexibility, and updating image tag conventions. Key changes include the addition of a WAF-aligned deployment option, restructuring of deployment parameters, and new infrastructure modules for better resource management.
Deployment and Parameterization Enhancements:
infra/main.waf.parameters.jsonfile to enable WAF-aligned, production-ready deployments with enhanced security, monitoring, scalability, and private networking. This allows users to choose between a default sandbox environment and a WAF-aligned configuration. [1] [2]infra/main.parameters.jsonto improve parameter naming, add support for separate backend/frontend image tags, and align with new environment variable conventions (e.g.,solutionName,azureAiServiceLocation,gptModelDeploymentType, etc.). [1] [2].github/workflows/deploy-KMGeneric.yml,.github/workflows/docker-build.yml) to use the newlatest_wafimage tag convention and updated parameter names for deployments. [1] [2]Infrastructure Modules:
infra/modules/deploy_aifp_aisearch_connection.bicepfor establishing connections between Azure AI Foundry Projects and Azure Cognitive Search resources, supporting improved integration and automation.infra/modules/keyVaultExport.bicepto automate exporting and referencing secrets in Azure Key Vault, improving security and manageability of sensitive data.Documentation Updates:
documents/DeploymentGuide.md,documents/CustomizingAzdParameters.md) to explain the new WAF-aligned deployment option, updated default image tag tolatest_waf, and clarified parameter usage for both sandbox and production scenarios. [1] [2] [3]These changes collectively make the deployment process more robust, secure, and adaptable for different environments, while also improving clarity and maintainability.
References: [1] [2] [3] [4] [5] [6] [7] [8] [9] [10]
Does this introduce a breaking change?
Golden Path Validation
Deployment Validation
What to Check
Verify that the following are valid
Other Information