[Resource] Support 'using none' in .bicepparam files for deployment commands

Author: polatengin

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

@@ -177,6 +177,22 @@ def is_bicepparam_file(file_path):
     return file_path.lower().endswith(".bicepparam")
 
 
+def is_using_none_bicepparam_file(file_path):
+    """Check if a .bicepparam file uses 'using none' declaration."""
+    try:
+        with open(file_path, 'r') as f:
+            content = f.read()
+    except IOError:
+        return False
+    for line in content.splitlines():
+        stripped = line.strip()
+        if stripped == '' or stripped.startswith('//'):
+            continue
+        # The 'using' declaration must be the first non-comment, non-empty statement
+        return stripped.lower() == 'using none'
+    return False
+
+
 def get_bicep_available_release_tags():
     try:
         os.environ.setdefault("CURL_CA_BUNDLE", certifi.where())

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

@@ -48,6 +48,7 @@
     run_bicep_command,
     is_bicep_file,
     is_bicepparam_file,
+    is_using_none_bicepparam_file,
     ensure_bicep_installation,
     remove_bicep_installation,
     get_bicep_latest_release_tag,
@@ -977,13 +978,33 @@ def _prepare_deployment_properties_unmodified(cmd, deployment_scope, template_fi
             if len(parameters) > 1:
                 raise ArgumentUsageError("Can not use --parameters argument more than once when using a .bicepparam file")
             bicepparam_file = parameters[0][0]
-            if not is_bicep_file(template_file):
-                raise ArgumentUsageError("Only a .bicep template is allowed with a .bicepparam parameter file")
 
-            build_bicepparam_output = run_bicep_command(cmd.cli_ctx, ["build-params", bicepparam_file, "--bicep-file", template_file, "--stdout"])
-            build_bicepparam_output_json = json.loads(build_bicepparam_output)
-            template_content = build_bicepparam_output_json["templateJson"]
-            bicepparam_json_content = build_bicepparam_output_json["parametersJson"]
+            if is_using_none_bicepparam_file(bicepparam_file):
+                # 'using none' bicepparam: template must be provided separately via --template-file
+                if not template_file:
+                    raise ArgumentUsageError(
+                        "The .bicepparam file uses 'using none', so a --template-file (-f) must be provided.")
+
+                # Build params only (no --bicep-file since there's no using declaration to verify)
+                build_bicepparam_output = run_bicep_command(cmd.cli_ctx, ["build-params", bicepparam_file, "--stdout"])
+                build_bicepparam_output_json = json.loads(build_bicepparam_output)
+                bicepparam_json_content = build_bicepparam_output_json["parametersJson"]
+
+                # Build template separately
+                template_content = (
+                    run_bicep_command(cmd.cli_ctx, ["build", "--stdout", template_file])
+                    if is_bicep_file(template_file)
+                    else read_file_content(template_file)
+                )
+            else:
+                # Normal 'using' declaration: existing behavior
+                if not is_bicep_file(template_file):
+                    raise ArgumentUsageError("Only a .bicep template is allowed with a .bicepparam parameter file")
+
+                build_bicepparam_output = run_bicep_command(cmd.cli_ctx, ["build-params", bicepparam_file, "--bicep-file", template_file, "--stdout"])
+                build_bicepparam_output_json = json.loads(build_bicepparam_output)
+                template_content = build_bicepparam_output_json["templateJson"]
+                bicepparam_json_content = build_bicepparam_output_json["parametersJson"]
         else:
             template_content = (
                 run_bicep_command(cmd.cli_ctx, ["build", "--stdout", template_file])

src/azure-cli/azure/cli/command_modules/resource/tests/latest/data/bicepparam/using_none_params.bicepparam

@@ -0,0 +1,5 @@
+using none
+
+param location = 'westus2'
+
+param kind = 'StorageV2'

src/azure-cli/azure/cli/command_modules/resource/tests/latest/data/bicepparam/using_none_with_comments_params.bicepparam

@@ -0,0 +1,8 @@
+// This is a comment
+// Another comment
+
+using none
+
+param location = 'westus2'
+
+param kind = 'StorageV2'

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

@@ -4235,7 +4235,131 @@ def test_resource_deployment_with_bicepparam_and_other_parameter_sources(self):
 
         with self.assertRaisesRegex(CLIError, "Can"):
             self.cmd('deployment group create --resource-group {rg} --template-file "{tf}" --parameters {params1} --parameters {params2}')
-        
+
+    def test_is_using_none_bicepparam_file(self):
+        from azure.cli.command_modules.resource._bicep import is_using_none_bicepparam_file
+        import tempfile
+
+        def _write_temp(content):
+            f = tempfile.NamedTemporaryFile(mode='w', suffix='.bicepparam', delete=False)
+            f.write(content)
+            f.close()
+            return f.name
+
+        # Basic 'using none'
+        path = _write_temp("using none\nparam location = 'westus2'\n")
+        self.assertTrue(is_using_none_bicepparam_file(path))
+        os.unlink(path)
+
+        # With leading comments
+        path = _write_temp("// comment\n// another\nusing none\nparam location = 'westus2'\n")
+        self.assertTrue(is_using_none_bicepparam_file(path))
+        os.unlink(path)
+
+        # With leading blank lines
+        path = _write_temp("\n\n  \nusing none\nparam location = 'westus2'\n")
+        self.assertTrue(is_using_none_bicepparam_file(path))
+        os.unlink(path)
+
+        # Case insensitive
+        path = _write_temp("Using None\nparam location = 'westus2'\n")
+        self.assertTrue(is_using_none_bicepparam_file(path))
+        os.unlink(path)
+
+        path = _write_temp("USING NONE\nparam location = 'westus2'\n")
+        self.assertTrue(is_using_none_bicepparam_file(path))
+        os.unlink(path)
+
+        # Normal using declaration
+        path = _write_temp("using './main.bicep'\nparam location = 'westus2'\n")
+        self.assertFalse(is_using_none_bicepparam_file(path))
+        os.unlink(path)
+
+        # Using with another path
+        path = _write_temp("using 'other.bicep'\nparam location = 'westus2'\n")
+        self.assertFalse(is_using_none_bicepparam_file(path))
+        os.unlink(path)
+
+        # Non-existent file
+        self.assertFalse(is_using_none_bicepparam_file('/nonexistent/path.bicepparam'))
+
+    @ResourceGroupPreparer(name_prefix='cli_test_deployment_with_bicepparam_using_none')
+    def test_resource_group_level_deployment_with_bicepparam_using_none(self):
+        curr_dir = os.path.dirname(os.path.realpath(__file__))
+        self.kwargs.update({
+            'tf': os.path.join(curr_dir, 'data\\bicepparam\\storage_account_template.bicep').replace('\\', '\\\\'),
+            'params': os.path.join(curr_dir, 'data\\bicepparam\\using_none_params.bicepparam').replace('\\', '\\\\')
+        })
+
+        self.cmd('deployment group validate --resource-group {rg} --template-file "{tf}" --parameters {params}', checks=[
+            self.check('properties.provisioningState', 'Succeeded')
+        ])
+
+        self.cmd('deployment group what-if --resource-group {rg} --template-file "{tf}" --parameters {params} --no-pretty-print', checks=[
+            self.check('status', 'Succeeded'),
+        ])
+
+        self.cmd('deployment group create --resource-group {rg} --template-file "{tf}" --parameters {params}', checks=[
+            self.check('properties.provisioningState', 'Succeeded')
+        ])
+
+    def test_resource_deployment_with_bicepparam_using_none_and_no_template(self):
+        import tempfile
+
+        f = tempfile.NamedTemporaryFile(mode='w', suffix='.bicepparam', delete=False)
+        f.write("using none\nparam location = 'westus2'\n")
+        f.close()
+
+        self.kwargs.update({
+            'rg': "exampleGroup",
+            'params': f.name
+        })
+
+        # The CLI argument validator requires --template-file, --template-uri, or --template-spec,
+        # so omitting all of them fails before reaching the bicepparam logic.
+        with self.assertRaisesRegex(CLIError, "Chose only one of"):
+            self.cmd('deployment group create --resource-group {rg} --parameters {params}')
+
+        os.unlink(f.name)
+
+    def test_resource_deployment_with_bicepparam_using_none_and_multiple_params(self):
+        import tempfile
+
+        f = tempfile.NamedTemporaryFile(mode='w', suffix='.bicepparam', delete=False)
+        f.write("using none\nparam location = 'westus2'\n")
+        f.close()
+
+        self.kwargs.update({
+            'rg': "exampleGroup",
+            'tf': "./main.bicep",
+            'params1': f.name,
+            'params2': "./other.json",
+        })
+
+        with self.assertRaisesRegex(CLIError, "Can not use --parameters argument more than once when using a .bicepparam file"):
+            self.cmd('deployment group create --resource-group {rg} --template-file "{tf}" --parameters {params1} --parameters {params2}')
+
+        os.unlink(f.name)
+
+    def test_resource_deployment_with_bicepparam_and_json_template_still_fails_without_using_none(self):
+        """Ensure existing behavior: non-using-none bicepparam + .json template still errors."""
+        import tempfile
+
+        f = tempfile.NamedTemporaryFile(mode='w', suffix='.bicepparam', delete=False)
+        f.write("using './something.bicep'\nparam location = 'westus2'\n")
+        f.close()
+
+        self.kwargs.update({
+            'rg': "exampleGroup",
+            'tf': "./main.json",
+            'params': f.name
+        })
+
+        with self.assertRaisesRegex(CLIError, "Only a .bicep template is allowed with a .bicepparam parameter file"):
+            self.cmd('deployment group create --resource-group {rg} --template-file "{tf}" --parameters {params}')
+
+        os.unlink(f.name)
+
     def test_subscription_level_deployment_with_bicep(self):
         curr_dir = os.path.dirname(os.path.realpath(__file__))
         self.kwargs.update({