Update rad init to generate bicep config #7664

sk593 · 2024-06-04T16:31:09Z

Description

Update rad init to generate bicep configuration

Type of change

This pull request fixes a bug in Radius and has an approved issue (issue link required).
This pull request adds or changes features of Radius and has an approved issue (issue link required).
This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).

Fixes: #issue_number

rynowak · 2024-06-05T22:09:00Z

pkg/cli/setup/application.go

+		"radius": "br:biceptypes.azurecr.io/radius:latest",
+		"aws": "br:biceptypes.azurecr.io/aws:latest"
+	}
+}`


//FYI @anthony-c-martin @alex-frankel

Anything else we should set here?

Nothing obvious to me, but @harshpatel17 can you also take a look?

This looks good

Thanks @harshpatel17

rynowak · 2024-06-05T22:09:56Z

pkg/cli/setup/application.go

+	} else if err != nil {
+		return err
+	}
+


Does the interactive display from rad init include this info in its output?

It should. The Run command would return an error if scaffolding fails. Tested forcing an error to confirm that it does (this may not be the actual error, this was just a dummy message).

rynowak · 2024-06-05T22:10:38Z

pkg/cli/setup/application.go

+	},
+	"providers": {
+		"radius": "br:biceptypes.azurecr.io/radius:latest",
+		"aws": "br:biceptypes.azurecr.io/aws:latest"


Will we end up publishing these to the official ACR registry? Or will we have our own?

The plan was to have them pushed to an ACR within OSS assets. Do you think it'd be better to have them in the official registry?

I don't have a strong opinion, I just wanted to know the plan 👍

rynowak · 2024-06-05T22:11:36Z

pkg/cli/setup/application_test.go

@@ -33,6 +33,7 @@ func Test_ScaffoldApplication_CreatesBothFiles(t *testing.T) {

 	require.FileExists(t, filepath.Join(directory, ".rad", "rad.yaml"))
 	require.FileExists(t, filepath.Join(directory, "app.bicep"))
+	require.FileExists(t, filepath.Join(directory, "bicepconfig.json"))


Should we have a test that validates the content of bicepconfig.json? I know it's hardcoded right now, but I thinking about future us ⌛

This should check that the generated file vs template are the same:

radius/pkg/cli/setup/application_test.go

Line 58 in e2eae38

require.Equal(t, bicepConfigTemplate, string(b))

Let me know if you meant something different

This is fine for now 👍 It will get more complicated in the future, which is why I wanted some kind of test to exist.

rynowak · 2024-07-01T22:29:56Z

pkg/cli/setup/application.go

 )

 const (
-	appBicepTemplate = `import radius as radius
+	appBicepTemplate = `provider radius


FYI it looks like this will change again to extension radius.

Got it, will update as part of this PR or in a follow up PR depending on when they release the next version with that change

willdavsmith

lgtm

willdavsmith · 2024-07-11T16:16:43Z

pkg/cli/setup/application.go


 @description('The Radius Application ID. Injected automatically by the rad CLI.')
 param application string

 resource demo 'Applications.Core/containers@2023-10-01-preview' = {
  name: 'demo'
+  location: 'global'


is this required now?

oops no, its not. will remove this

Signed-off-by: sk593 <[email protected]>

# Description Update rad init to generate bicep configuration <img width="413" alt="Screenshot 2024-06-03 at 10 45 14 PM" src="https://github.com/radius-project/radius/assets/42750942/1fbe214d-91e6-435c-aec0-57e57485a70d"> ## Type of change  - This pull request fixes a bug in Radius and has an approved issue (issue link required). - This pull request adds or changes features of Radius and has an approved issue (issue link required). - This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).  Fixes: #issue_number --------- Signed-off-by: sk593 <[email protected]>

# Description This PR contains all the changes for the Bicep compiler merge. The branch has had smaller PRs opened for specific features that can be found below: - [x] Bicep types generator is updated to use the `bicep-types` repository as a submodule. This includes updating the types contract and adding support for resource methods (eg `listSecrets`): 43403fd . There was also a small update to how we handle flags on the `location` [property](19afe96) - [x] Update to build workflow to initialize the submodule and publish types to `biceptypes.azurecr.io` using the `bicep publish-extension` command: fed2462 - [x] Update validate bicep workflow to validate bicep files in the repository with the official Bicep compiler. This includes updating extension imports of all bicep files and adding a `bicepconfig.json` to the repository: #7702 - [x] Update functional test workflow to publish types to `biceptypes.azurecr.io`. This includes publishing the bicep types to a PR tag and adding a temporary `bicepconfig.json` to consume the PR-specific types [#7730] - [x] Update release workflow to publish types to a release-specific tag. This includes running a build in the `bicep-types-aws` repo to publish AWS types to a release tag - [x] Updates to `rad bicep download`. This command will download the official Bicep binary instead of the Radius one. The install script calls this command so the official Bicep binary will be downloaded on a Radius install: bb8da88 - [x] Updates to `rad init` to generate a default `bicepconfig.json`. This will pull the Radius and AWS types in our ACR with the current release tag: #7664 ## Type of change  - This pull request fixes a bug in Radius and has an approved issue (issue link required). - This pull request adds or changes features of Radius and has an approved issue (issue link required). - This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).  Fixes: #issue_number --------- # Description _Please explain the changes you've made._ ## Type of change  - This pull request fixes a bug in Radius and has an approved issue (issue link required). - This pull request adds or changes features of Radius and has an approved issue (issue link required). - This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).  Fixes: #issue_number --------- Signed-off-by: sk593 <[email protected]>

This PR contains all the changes for the Bicep compiler merge. The branch has had smaller PRs opened for specific features that can be found below: - [x] Bicep types generator is updated to use the `bicep-types` repository as a submodule. This includes updating the types contract and adding support for resource methods (eg `listSecrets`): radius-project@43403fd . There was also a small update to how we handle flags on the `location` [property](radius-project@19afe96) - [x] Update to build workflow to initialize the submodule and publish types to `biceptypes.azurecr.io` using the `bicep publish-extension` command: radius-project@fed2462 - [x] Update validate bicep workflow to validate bicep files in the repository with the official Bicep compiler. This includes updating extension imports of all bicep files and adding a `bicepconfig.json` to the repository: radius-project#7702 - [x] Update functional test workflow to publish types to `biceptypes.azurecr.io`. This includes publishing the bicep types to a PR tag and adding a temporary `bicepconfig.json` to consume the PR-specific types [radius-project#7730] - [x] Update release workflow to publish types to a release-specific tag. This includes running a build in the `bicep-types-aws` repo to publish AWS types to a release tag - [x] Updates to `rad bicep download`. This command will download the official Bicep binary instead of the Radius one. The install script calls this command so the official Bicep binary will be downloaded on a Radius install: radius-project@bb8da88 - [x] Updates to `rad init` to generate a default `bicepconfig.json`. This will pull the Radius and AWS types in our ACR with the current release tag: radius-project#7664  - This pull request fixes a bug in Radius and has an approved issue (issue link required). - This pull request adds or changes features of Radius and has an approved issue (issue link required). - This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).  Fixes: #issue_number --------- _Please explain the changes you've made._  - This pull request fixes a bug in Radius and has an approved issue (issue link required). - This pull request adds or changes features of Radius and has an approved issue (issue link required). - This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).  Fixes: #issue_number --------- Signed-off-by: sk593 <[email protected]>

# Description This PR contains all the changes for the Bicep compiler merge. The branch has had smaller PRs opened for specific features that can be found below: - [x] Bicep types generator is updated to use the `bicep-types` repository as a submodule. This includes updating the types contract and adding support for resource methods (eg `listSecrets`): radius-project@43403fd . There was also a small update to how we handle flags on the `location` [property](radius-project@19afe96) - [x] Update to build workflow to initialize the submodule and publish types to `biceptypes.azurecr.io` using the `bicep publish-extension` command: radius-project@fed2462 - [x] Update validate bicep workflow to validate bicep files in the repository with the official Bicep compiler. This includes updating extension imports of all bicep files and adding a `bicepconfig.json` to the repository: radius-project#7702 - [x] Update functional test workflow to publish types to `biceptypes.azurecr.io`. This includes publishing the bicep types to a PR tag and adding a temporary `bicepconfig.json` to consume the PR-specific types [radius-project#7730] - [x] Update release workflow to publish types to a release-specific tag. This includes running a build in the `bicep-types-aws` repo to publish AWS types to a release tag - [x] Updates to `rad bicep download`. This command will download the official Bicep binary instead of the Radius one. The install script calls this command so the official Bicep binary will be downloaded on a Radius install: radius-project@bb8da88 - [x] Updates to `rad init` to generate a default `bicepconfig.json`. This will pull the Radius and AWS types in our ACR with the current release tag: radius-project#7664 ## Type of change  - This pull request fixes a bug in Radius and has an approved issue (issue link required). - This pull request adds or changes features of Radius and has an approved issue (issue link required). - This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).  Fixes: #issue_number --------- # Description _Please explain the changes you've made._ ## Type of change  - This pull request fixes a bug in Radius and has an approved issue (issue link required). - This pull request adds or changes features of Radius and has an approved issue (issue link required). - This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).  Fixes: #issue_number --------- Signed-off-by: sk593 <[email protected]> Signed-off-by: Reshma Abdul Rahim <[email protected]>

This PR contains all the changes for the Bicep compiler merge. The branch has had smaller PRs opened for specific features that can be found below: - [x] Bicep types generator is updated to use the `bicep-types` repository as a submodule. This includes updating the types contract and adding support for resource methods (eg `listSecrets`): radius-project@43403fd . There was also a small update to how we handle flags on the `location` [property](radius-project@19afe96) - [x] Update to build workflow to initialize the submodule and publish types to `biceptypes.azurecr.io` using the `bicep publish-extension` command: radius-project@fed2462 - [x] Update validate bicep workflow to validate bicep files in the repository with the official Bicep compiler. This includes updating extension imports of all bicep files and adding a `bicepconfig.json` to the repository: radius-project#7702 - [x] Update functional test workflow to publish types to `biceptypes.azurecr.io`. This includes publishing the bicep types to a PR tag and adding a temporary `bicepconfig.json` to consume the PR-specific types [radius-project#7730] - [x] Update release workflow to publish types to a release-specific tag. This includes running a build in the `bicep-types-aws` repo to publish AWS types to a release tag - [x] Updates to `rad bicep download`. This command will download the official Bicep binary instead of the Radius one. The install script calls this command so the official Bicep binary will be downloaded on a Radius install: radius-project@bb8da88 - [x] Updates to `rad init` to generate a default `bicepconfig.json`. This will pull the Radius and AWS types in our ACR with the current release tag: radius-project#7664  - This pull request fixes a bug in Radius and has an approved issue (issue link required). - This pull request adds or changes features of Radius and has an approved issue (issue link required). - This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).  Fixes: #issue_number --------- _Please explain the changes you've made._  - This pull request fixes a bug in Radius and has an approved issue (issue link required). - This pull request adds or changes features of Radius and has an approved issue (issue link required). - This pull request is a minor refactor, code cleanup, test improvement, or other maintenance task and doesn't change the functionality of Radius (issue link optional).  Fixes: #issue_number --------- Signed-off-by: sk593 <[email protected]>

sk593 requested review from a team as code owners June 4, 2024 16:31

sk593 mentioned this pull request Jun 4, 2024

[wip - do not review] Update rad init to generate bicep config #7539

Closed

sk593 force-pushed the feature-bicep-compiler-merge branch 2 times, most recently from edd635a to 262a6cf Compare June 4, 2024 16:40

sk593 force-pushed the update-init-bicepConfig branch 2 times, most recently from da731ae to e821967 Compare June 4, 2024 16:45

sk593 force-pushed the feature-bicep-compiler-merge branch 2 times, most recently from d0cf79c to f3326e9 Compare June 5, 2024 21:52

sk593 force-pushed the update-init-bicepConfig branch from f085ec6 to e2eae38 Compare June 5, 2024 21:59

rynowak reviewed Jun 5, 2024

View reviewed changes

sk593 force-pushed the feature-bicep-compiler-merge branch 13 times, most recently from c6f8e29 to 6d6ed0b Compare June 14, 2024 21:45

sk593 force-pushed the update-init-bicepConfig branch from e2eae38 to ccad2fc Compare June 14, 2024 22:10

sk593 force-pushed the feature-bicep-compiler-merge branch 2 times, most recently from 0bb6020 to f65a916 Compare June 17, 2024 23:26

rynowak reviewed Jul 1, 2024

View reviewed changes

sk593 force-pushed the feature-bicep-compiler-merge branch from fed2462 to 0cc2c64 Compare July 10, 2024 21:18

sk593 force-pushed the update-init-bicepConfig branch from 20d73e3 to 206bc0e Compare July 10, 2024 22:02

willdavsmith approved these changes Jul 11, 2024

View reviewed changes

sk593 added 7 commits July 11, 2024 09:29

add bicepconfig during init

5a97a3a

Signed-off-by: sk593 <[email protected]>

add bicepconfig during init

29571b0

Signed-off-by: sk593 <[email protected]>

update gitignore

8e9036e

Signed-off-by: sk593 <[email protected]>

update app.bicep

78b6652

Signed-off-by: sk593 <[email protected]>

nit

6055e85

Signed-off-by: sk593 <[email protected]>

update versioning

3a418db

Signed-off-by: sk593 <[email protected]>

update to extensions

0951076

Signed-off-by: sk593 <[email protected]>

sk593 force-pushed the update-init-bicepConfig branch 2 times, most recently from 63afcdb to 5f799d7 Compare July 11, 2024 18:26

nit

5f799d7

Signed-off-by: sk593 <[email protected]>

sk593 merged commit bd9f475 into radius-project:feature-bicep-compiler-merge Jul 22, 2024
1 check passed

sk593 mentioned this pull request Aug 1, 2024

Bicep compiler merge #7662

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update rad init to generate bicep config #7664

Update rad init to generate bicep config #7664

sk593 commented Jun 4, 2024

rynowak Jun 5, 2024

alex-frankel Jun 6, 2024

harshpatel17 Jun 10, 2024

rynowak Jun 11, 2024

rynowak Jun 5, 2024

sk593 Jun 6, 2024

rynowak Jun 5, 2024

sk593 Jun 5, 2024

rynowak Jun 6, 2024

rynowak Jun 5, 2024

sk593 Jun 6, 2024

rynowak Jun 6, 2024

rynowak Jul 1, 2024

sk593 Jul 1, 2024

willdavsmith left a comment

willdavsmith Jul 11, 2024

sk593 Jul 11, 2024

Update rad init to generate bicep config #7664

Update rad init to generate bicep config #7664

Conversation

sk593 commented Jun 4, 2024

Description

Type of change

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

willdavsmith left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment