Skip to content

Commit

Permalink
Rel v0.21: CherryPick PR5600 (#5604)
Browse files Browse the repository at this point in the history
# Description

Cherry Picking #5600 into v0.21 release


## Checklist

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

* [ ] Code compiles correctly
* [ ] Adds necessary unit tests for change
* [ ] Adds necessary E2E tests for change
* [ ] Unit tests passing
* [ ] Extended the documentation / Created issue for it

## Auto-generated summary

<!--
GitHub Copilot for docs will auto-generate a summary of the PR
-->

<!--
copilot:all
-->
### <samp>🤖 Generated by Copilot at 50aa7d5</samp>

### Summary
📝🐛🧪

<!--
1. 📝 - This emoji represents documentation, which is one of the aspects
that was updated in the workflow.
2. 🐛 - This emoji represents bug fixes, which is another aspect that was
addressed in the workflow by removing the location field and fixing the
newline issue.
3. 🧪 - This emoji represents testing, which is the third aspect that was
improved in the workflow by aligning the validation tool with the radius
CLI tool.
-->
Update workflow and templates to match radius CLI release/0.21. This
improves the project's documentation, validation, and configuration.

> _To keep the project in sync_
> _They updated the docs and the `rad` link_
> _They removed location_
> _And fixed newline creation_
> _In the setup package templates with a wink_

### Walkthrough
* Align documentation and sample code with release candidate version of
radius CLI tool
([link](https://github.com/project-radius/radius/pull/5604/files?diff=unified&w=0#diff-4f41a75886a1a479805bae1b7fb335479735aa7740e02b9e5c19992ead18f73eL40-R40),
[link](https://github.com/project-radius/radius/pull/5604/files?diff=unified&w=0#diff-4f41a75886a1a479805bae1b7fb335479735aa7740e02b9e5c19992ead18f73eL47-R47),
[link](https://github.com/project-radius/radius/pull/5604/files?diff=unified&w=0#diff-4f41a75886a1a479805bae1b7fb335479735aa7740e02b9e5c19992ead18f73eL60-R60))
* Remove location field from application.yaml template in setup package
([link](https://github.com/project-radius/radius/pull/5604/files?diff=unified&w=0#diff-1b0ac5c011aaaf6673a23365f05fe4d2ebdc793c135984d7b3410e59ef92fa75L30))
* Remove trailing newline in rad.yaml template in setup package
([link](https://github.com/project-radius/radius/pull/5604/files?diff=unified&w=0#diff-1b0ac5c011aaaf6673a23365f05fe4d2ebdc793c135984d7b3410e59ef92fa75L43-R46))

---------

Co-authored-by: Yetkin Timocin <[email protected]>
  • Loading branch information
lakshmimsft and ytimocin authored May 26, 2023
1 parent 64b2000 commit de4bc83
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/validate-bicep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: python ./.github/scripts/get_release_version.py
- name: Download rad-bicep-corerp
run: |
./.github/scripts/curl-with-retries.sh https://get.radapp.dev/tools/bicep-extensibility/${{ env.REL_CHANNEL }}/linux-x64/rad-bicep --output rad-bicep-corerp
./.github/scripts/curl-with-retries.sh https://get.radapp.dev/tools/bicep-extensibility/0.21.0-rc1/linux-x64/rad-bicep --output rad-bicep-corerp
chmod +x rad-bicep-corerp
./rad-bicep-corerp --version
- name: Verify Bicep files
Expand Down
5 changes: 2 additions & 3 deletions pkg/cli/setup/application.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ param application string
resource demo 'Applications.Core/containers@2022-03-15-privatepreview' = {
name: 'demo'
location: 'global'
properties: {
application: application
container: {
Expand All @@ -40,11 +39,11 @@ resource demo 'Applications.Core/containers@2022-03-15-privatepreview' = {
}
}
}
` // Trailing newline intentional.
` // Trailing newline intentional.

radYamlTemplate = `workspace:
application: %q
` // Trailing newline intentional.
` // Trailing newline intentional.
)

// ScaffoldApplication creates a working sample application in the provided directory
Expand Down

0 comments on commit de4bc83

Please sign in to comment.