Skip to content

Commit d429c2f

Browse files
[ARM] Fix #26256: az bicep publish/restore/generate-params: Fix version checks without bicep installed (#26374)
1 parent 2e40225 commit d429c2f

File tree

3 files changed

+42
-3
lines changed

3 files changed

+42
-3
lines changed

src/azure-cli/azure/cli/command_modules/resource/custom.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3775,6 +3775,8 @@ def format_bicep_file(cmd, file, stdout=None, outdir=None, outfile=None, newline
37753775

37763776

37773777
def publish_bicep_file(cmd, file, target, documentationUri=None):
3778+
ensure_bicep_installation(cmd.cli_ctx)
3779+
37783780
minimum_supported_version = "0.4.1008"
37793781
if bicep_version_greater_than_or_equal_to(minimum_supported_version):
37803782
args = ["publish", file, "--target", target]
@@ -3790,6 +3792,8 @@ def publish_bicep_file(cmd, file, target, documentationUri=None):
37903792

37913793

37923794
def restore_bicep_file(cmd, file, force=None):
3795+
ensure_bicep_installation(cmd.cli_ctx)
3796+
37933797
minimum_supported_version = "0.4.1008"
37943798
if bicep_version_greater_than_or_equal_to(minimum_supported_version):
37953799
args = ["restore", file]
@@ -3816,6 +3820,8 @@ def list_bicep_cli_versions(cmd):
38163820

38173821

38183822
def generate_params_file(cmd, file, no_restore=None, outdir=None, outfile=None, stdout=None):
3823+
ensure_bicep_installation(cmd.cli_ctx)
3824+
38193825
minimum_supported_version = "0.7.4"
38203826
if bicep_version_greater_than_or_equal_to(minimum_supported_version):
38213827
args = ["generate-params", file]

src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource.py

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4016,7 +4016,15 @@ def test_bicep_list_versions(self):
40164016

40174017
# Because don't want to record bicep cli binary
40184018
class BicepBuildTest(LiveScenarioTest):
4019-
4019+
4020+
def setup(self):
4021+
super().setup()
4022+
self.cmd('az bicep uninstall')
4023+
4024+
def tearDown(self):
4025+
super().tearDown()
4026+
self.cmd('az bicep uninstall')
4027+
40204028
def test_bicep_build_decompile(self):
40214029
curr_dir = os.path.dirname(os.path.realpath(__file__))
40224030
tf = os.path.join(curr_dir, 'storage_account_deploy.bicep').replace('\\', '\\\\')
@@ -4039,6 +4047,14 @@ def test_bicep_build_decompile(self):
40394047

40404048
class BicepGenerateParamsTest(LiveScenarioTest):
40414049

4050+
def setup(self):
4051+
super().setup()
4052+
self.cmd('az bicep uninstall')
4053+
4054+
def tearDown(self):
4055+
super().tearDown()
4056+
self.cmd('az bicep uninstall')
4057+
40424058
def test_bicep_generate_params(self):
40434059
curr_dir = os.path.dirname(os.path.realpath(__file__))
40444060
tf = os.path.join(curr_dir, 'sample_params.bicep').replace('\\', '\\\\')
@@ -4085,6 +4101,15 @@ def test_install_and_upgrade(self):
40854101

40864102

40874103
class BicepRestoreTest(LiveScenarioTest):
4104+
4105+
def setup(self):
4106+
super().setup()
4107+
self.cmd('az bicep uninstall')
4108+
4109+
def tearDown(self):
4110+
super().tearDown()
4111+
self.cmd('az bicep uninstall')
4112+
40884113
def test_restore(self):
40894114
curr_dir = os.path.dirname(os.path.realpath(__file__))
40904115
bf = os.path.join(curr_dir, 'data', 'external_modules.bicep').replace('\\', '\\\\')
@@ -4103,6 +4128,15 @@ def test_restore(self):
41034128

41044129

41054130
class BicepFormatTest(LiveScenarioTest):
4131+
4132+
def setup(self):
4133+
super().setup()
4134+
self.cmd('az bicep uninstall')
4135+
4136+
def tearDown(self):
4137+
super().tearDown()
4138+
self.cmd('az bicep uninstall')
4139+
41064140
def test_format(self):
41074141
curr_dir = os.path.dirname(os.path.realpath(__file__))
41084142
bf = os.path.join(curr_dir, 'storage_account_deploy.bicep').replace('\\', '\\\\')
@@ -4119,6 +4153,7 @@ def test_format(self):
41194153

41204154

41214155
class DeploymentWithBicepScenarioTest(LiveScenarioTest):
4156+
41224157
def setup(self):
41234158
super.setup()
41244159
self.cmd('az bicep uninstall')

src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_bicep.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,3 @@ def test_validate_target_scope_success_if_target_scope_matches_deployment_scope(
194194
def _remove_bicep_version_check_file(self):
195195
with contextlib.suppress(FileNotFoundError):
196196
os.remove(_bicep_version_check_file_path)
197-
198-

0 commit comments

Comments
 (0)