Skip to content

Mergefromupstream #15

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

Merged
merged 3 commits into from
Jan 6, 2025
Merged

Mergefromupstream #15

merged 3 commits into from
Jan 6, 2025

Conversation

jwaltireland
Copy link
Collaborator

Description

Please explain the changes you've made.

Issue reference

The issue this PR will close: #[issue number]

Checklist

Please make sure you've completed the relevant tasks for this PR out of the following list:

  • All acceptance criteria in the backlog item are met
  • The documentation is updated to cover any new or changed features
  • Manual tests have passed
  • Relevant issues are linked to this PR

jamasten and others added 2 commits November 27, 2024 16:14
* Fixed API versions for MAG

* Added condition for role assignment

* Fixed API version for MAG

* Fixed API version for MAG

* Compiled bicep changes

* Moved role definitions, Fixed tags & workspace names

* Fixed tags

* Fixed workspace names

* Moved role definitions, Fixed tags & comment

* Moved role definitions; Fixed scopes, tags, & comments

* Moved role definitions

* Moved role definitions; Fixed tags & comments

* Compiled bicep changes

* Sorted params, Added marketplace terms deployment & dependency

* Added missing params

* Added param for session hosts deployment

* Compiled bicep changes

* Added new element for security groups

* Added example of security principal, Updated property name for security principal

* Compiled bicep changes

* Fixed scopes

* Fix tags, Simplified subnet resource ID

* Added resources for tagging

* Fixed names for app group & workspaces

* Fixed tags

* Fixed name for app group

* Removed param

* Compiled bicep changes

* Fixed app group name

* Added VM plan

* Fixed JSON conversion

* Updated role assignment for scaling plan mgmt

* Moved control plane to mgmt

* Moved control plane to management

* Added policy & resource group; Updated deployment names; Fixed tags; Moved role assignment & function app; Updated comments

* Moved mgmt step

* Fixed tags

* Fixed tags

* Updated SKU & PS version

* Moved function resource

* Added function resource

* Moved function app & function

* Fixed resource group scope

* Added condition to role assignment

* Fixed VM size constraints

* Updated naming changes

* GitHub Action: Build Bicep to JSON

---------

Co-authored-by: github-actions <github-actions@github.com>
@jwaltireland jwaltireland merged commit 797a12a into main Jan 6, 2025
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