Skip to content

fix: recover azd deployments in restricted environments - #85

Open
Naveen Krishnan (navintkr) wants to merge 1 commit into
microsoft:mainfrom
navintkr:fix/azd-deployment-policy-recovery
Open

fix: recover azd deployments in restricted environments#85
Naveen Krishnan (navintkr) wants to merge 1 commit into
microsoft:mainfrom
navintkr:fix/azd-deployment-policy-recovery

Conversation

@navintkr

Copy link
Copy Markdown

Purpose

  • Allow operators to override the deterministic five-character resource suffix when a soft-deleted globally unique AI Services name remains reserved.
  • Keep knowledge-base setup working when organizational policy blocks local Blob data-plane access by using stable public repository URLs for citations while indexing local PDF content.
  • Document both recovery paths in the deployment and maintainer guidance.

Does this introduce a breaking change?

  • Yes
  • No

Golden Path Validation

  • I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.

Deployment Validation

  • I have validated the deployment process successfully and all services are running as expected with this change.

What to Check

  • A default deployment still uses the deterministic resource suffix when AZURE_SOLUTION_UNIQUE_TEXT is unset.
  • Setting AZURE_SOLUTION_UNIQUE_TEXT consistently updates resource names and exported outputs.
  • Blob failures other than AuthorizationFailure still fail fast.
  • Citation fallback resolves the upstream remote default branch and falls back to main when origin/HEAD is unavailable.

Other Information

Validated with:

  • Successful azd provisioning preview and full East US deployment.
  • All six post-provision bootstrap steps completed.
  • Azure AI Search indexed 32 document chunks.
  • Fabric workspace installation completed with 39 items.
  • python -m compileall -q infra/scripts.
  • JSON parsing of infra/main.parameters.json.
  • az bicep build --file infra/main.bicep (existing repository warnings only).
  • git diff --check.

@microsoft-github-policy-service

Copy link
Copy Markdown

Naveen Krishnan (@navintkr) please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

Copilot AI 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.

Pull request overview

This PR adds recovery mechanisms for azd up deployments in restricted environments by (1) allowing operators to override the deterministic 5-character uniqueness suffix used in globally-unique resource names, and (2) keeping knowledge-base indexing functional when Blob data-plane access is blocked by using public repository URLs for citations.

Changes:

  • Add a solutionUniqueTextOverride parameter wired from AZURE_SOLUTION_UNIQUE_TEXT and propagate it through naming + outputs.
  • Add a Blob upload fallback in setup_knowledge_base that switches citation URLs to raw GitHub URLs when Blob uploads fail with AuthorizationFailure.
  • Update deployment documentation and maintainer guidance to describe both recovery paths.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
infra/scripts/foundry/step_knowledge_base.py Adds AuthorizationFailure fallback to use raw GitHub URLs for citations while indexing local PDF content.
infra/main.parameters.json Introduces solutionUniqueTextOverride parameter sourced from AZURE_SOLUTION_UNIQUE_TEXT.
infra/main.bicep Adds override parameter, uses it for suffix computation and passes through to the Foundry module + outputs.
docs/fabric/DeploymentGuideFabricManual.md Mentions citation-URL fallback behavior in the automated deployment path.
docs/DeploymentGuide.md Documents the new env var and the Blob-policy citation fallback in overview/results text.
.github/instructions/infra-scripts.instructions.md Updates maintainer instructions to document the AuthorizationFailure citation fallback behavior.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

except (subprocess.CalledProcessError, FileNotFoundError) as exc:
raise RuntimeError("Could not determine the GitHub repository for document citations") from exc

match = re.search(r"github\.com[/:]([^/]+/[^/]+?)(?:\.git)?$", remote)
Comment thread infra/main.bicep
param deployingUserPrincipalType string = 'User'

// ========== Variables ========== //
var effectiveSolutionUniqueText = empty(solutionUniqueTextOverride) ? solutionUniqueText : solutionUniqueTextOverride
@Yamini1-Microsoft

Yamini Dhiman (Yamini1-Microsoft) commented Aug 25, 2026

Copy link
Copy Markdown
Contributor

Hello Naveen Krishnan (@navintkr)
We are currently reviewing this PR and will get back to you shortly. Additionally, there are a few comments from the Copilot Reviewer that need to be addressed.

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.

3 participants