Skip to content

[ARM] az ts create: Make parameter --template-file support bicep file #18888

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.

Sign up for GitHub

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
zhoxing-ms merged 6 commits into from
Jul 28, 2021
Merged

[ARM] az ts create: Make parameter --template-file support bicep file #18888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69f9e17
Add support for bicep files in TS
Xynoclafe Jun 15, 2021
63461f7
Add tests
Xynoclafe Jul 15, 2021
81a2a4b
Merge branch 'Azure:dev' into bicepTSSupport
Xynoclafe Jul 15, 2021
558eb55
re-record test
Xynoclafe Jul 15, 2021
4e84733
Changed new test to a live test
Xynoclafe Jul 27, 2021
20ace2f
Changed new test to a live test #2
Xynoclafe Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/azure-cli/azure/cli/command_modules/resource/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1844,9 +1844,15 @@ def create_template_spec(cmd, resource_group_name, name, template_file=None, loc

if template_file:
from azure.cli.command_modules.resource._packing_engine import (pack)
packed_template = pack(cmd, template_file)
input_template = getattr(packed_template, 'RootTemplate')
artifacts = getattr(packed_template, 'Artifacts')
if is_bicep_file(template_file):
template_content = run_bicep_command(["build", "--stdout", template_file])
input_content = _remove_comments_from_json(template_content, file_path=template_file)
input_template = json.loads(json.dumps(input_content))
artifacts = []
else:
packed_template = pack(cmd, template_file)
input_template = getattr(packed_template, 'RootTemplate')
artifacts = getattr(packed_template, 'Artifacts')

if ui_form_definition_file:
ui_form_definition_content = _remove_comments_from_json(read_file_content(ui_form_definition_file))
Expand Down Expand Up @@ -1888,9 +1894,15 @@ def update_template_spec(cmd, resource_group_name=None, name=None, template_spec
existing_template, artifacts, input_ui_form_definition = None, None, None
if template_file:
from azure.cli.command_modules.resource._packing_engine import (pack)
packed_template = pack(cmd, template_file)
input_template = getattr(packed_template, 'RootTemplate')
artifacts = getattr(packed_template, 'Artifacts')
if is_bicep_file(template_file):
template_content = run_bicep_command(["build", "--stdout", template_file])
input_content = _remove_comments_from_json(template_content, file_path=template_file)
input_template = json.loads(json.dumps(input_content))
artifacts = []
else:
packed_template = pack(cmd, template_file)
input_template = getattr(packed_template, 'RootTemplate')
artifacts = getattr(packed_template, 'Artifacts')

if ui_form_definition_file:
ui_form_definition_content = _remove_comments_from_json(read_file_content(ui_form_definition_file))
Expand Down
26 changes: 26 additions & 0 deletions src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3759,6 +3759,32 @@ def test_tenent_level_deployment_with_bicep(self):
self.check('properties.provisioningState', 'Succeeded')
])

@ResourceGroupPreparer(name_prefix='cli_test_template_specs', location='westus')
def test_create_template_specs_bicep(self, resource_group, resource_group_location):
curr_dir = os.path.dirname(os.path.realpath(__file__))
template_spec_name = self.create_random_name('cli-test-create-template-spec', 60)
self.kwargs.update({
'template_spec_name': template_spec_name,
'tf': os.path.join(curr_dir, 'storage_account_deploy.bicep').replace('\\', '\\\\'),
'resource_group_location': resource_group_location,
'description': '"AzCLI test root template spec from bicep"',
'version_description': '"AzCLI test version of root template spec from bicep"',
})

result = self.cmd('ts create -g {rg} -n {template_spec_name} -v 1.0 -l {resource_group_location} -f "{tf}" --description {description} --version-description {version_description}', checks=[
self.check('location', "westus"),
self.check('mainTemplate.functions', []),
self.check("name", "1.0")
]).get_output_in_json()

with self.assertRaises(IncorrectUsageError) as err:
self.cmd('ts create --name {template_spec_name} -g {rg} -l {resource_group_location} --template-file "{tf}"')
self.assertTrue("please provide --template-uri if --query-string is specified" in str(err.exception))

# clean up
self.kwargs['template_spec_id'] = result['id'].replace('/versions/1.0', '')
self.cmd('ts delete --template-spec {template_spec_id} --yes')

def _remove_bicep_cli(self):
bicep_cli_path = self._get_bicep_cli_path()
if os.path.isfile(bicep_cli_path):
Expand Down