Extension configuration updates for stacks extensibility support.

docs/params-file-grammar.md

@@ -2,6 +2,7 @@ program -> statement* EOF
 statement -> 
   usingDecl |
   parameterDecl |
+  extensionConfigDecl |
   NL
 
 usingDecl ->
@@ -13,6 +14,9 @@ usingDecl ->
 parameterDecl ->
   "parameter" IDENTIFIER(name) "=" literalValue NL
 
+extensionConfigDecl ->
+  "extension" IDENTIFIER(name) "with" object NL
+
 stringLiteral -> "'" STRINGCHAR* "'"
 
 literalValue -> NUMBER | "true" | "false" | "null" | stringLiteral | object | array

src/Bicep.Core.IntegrationTests/ExtensibilityTests.cs

@@ -1,14 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using Bicep.Core.CodeAction;
 using Bicep.Core.Configuration;
 using Bicep.Core.Diagnostics;
 using Bicep.Core.IntegrationTests.Extensibility;
 using Bicep.Core.UnitTests;
 using Bicep.Core.UnitTests.Assertions;
 using Bicep.Core.UnitTests.Utils;
-using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json.Linq;
 
@@ -656,5 +654,149 @@ extension foo as foo
             result.Template.Should().HaveValueAtPath("$.extensions.foo.name", "Foo");
             result.Template.Should().HaveValueAtPath("$.resources.myApp.extension", "foo");
         }
+
+        [TestMethod]
+        public void Module_with_required_extension_config_can_be_compiled_successfully()
+        {
+            var paramsUri = new Uri("file:///main.bicepparam");
+            var mainUri = new Uri("file:///main.bicep");
+            var moduleAUri = new Uri("file:///modulea.bicep");
+
+            // TODO(kylealbert): Remove 'with' clause in template when that's removed
+            var files = new Dictionary<Uri, string>
+            {
+                [paramsUri] =
+                    """
+                    using 'main.bicep'
+
+                    param inputa = 'abc'
+
+                    extension k8s with {
+                      kubeConfig: 'abc'
+                      namespace: 'other'
+                    }
+                    """,
+                [mainUri] =
+                    """
+                    param inputa string
+
+                    extension kubernetes with {
+                      kubeConfig: 'DELETE'
+                      namespace: 'DELETE'
+                    } as k8s
+
+                    extension 'br:mcr.microsoft.com/bicep/extensions/microsoftgraph/v1.0:0.1.8-preview'
+
+                    module modulea 'modulea.bicep' = {
+                      name: 'modulea'
+                      params: {
+                        inputa: inputa
+                      }
+                      extensionConfigs: {
+                        kubernetes: {
+                          kubeConfig: 'fromModule'
+                          namespace: 'other'
+                        }
+                      }
+                    }
+
+                    output outputa string = modulea.outputs.outputa
+                    """,
+                [moduleAUri] =
+                    """
+                    param inputa string
+
+                    extension kubernetes with {
+                      kubeConfig: 'DELETE'
+                      namespace: 'DELETE'
+                    }
+
+                    extension 'br:mcr.microsoft.com/bicep/extensions/microsoftgraph/v1.0:0.1.8-preview' as graph
+
+                    output outputa string = inputa
+                    """
+            };
+
+            var compilation = Services.BuildCompilation(files, paramsUri);
+
+            compilation.Should().NotHaveAnyDiagnostics_WithAssertionScoping(d => d.IsError());
+        }
+
+        [DataTestMethod]
+        [DataRow("MissingExtensionConfigsDeclaration")]
+        [DataRow("MissingRequiredExtensionConfig")]
+        [DataRow("MissingRequiredConfigProperty")]
+        [DataRow("PropertyIsNotDefinedInSchema")]
+        [DataRow("ConfigProvidedForExtensionThatDoesNotAcceptConfig")]
+        public void Module_with_invalid_extension_config_produces_diagnostic(string scenario)
+        {
+            var mainUri = new Uri("file:///main.bicep");
+            var moduleAUri = new Uri("file:///modulea.bicep");
+
+            var extensionConfigsStr = scenario switch
+            {
+                "MissingExtensionConfigsDeclaration" => "",
+                "MissingRequiredExtensionConfig" => "extensionConfigs: {}",
+                "MissingRequiredConfigProperty" => "extensionConfigs: { kubernetes: { namespace: 'other' } }",
+                "PropertyIsNotDefinedInSchema" => "extensionConfigs: { kubernetes: { kubeConfig: 'test', namespace: 'other', extra: 'extra' } }",
+                "ConfigProvidedForExtensionThatDoesNotAcceptConfig" => "extensionConfigs: { kubernetes: { kubeConfig: 'test', namespace: 'other' }, graph: { } }",
+                _ => throw new NotImplementedException()
+            };
+
+            // TODO(kylealbert): Remove 'with' clause in template when that's removed
+            var files = new Dictionary<Uri, string>
+            {
+                [mainUri] =
+                    $$"""
+                      param inputa string
+
+                      module modulea 'modulea.bicep' = {
+                        name: 'modulea'
+                        params: {
+                          inputa: inputa
+                        }
+                        {{extensionConfigsStr}}
+                      }
+
+                      output outputa string = modulea.outputs.outputa
+                      """,
+                [moduleAUri] =
+                    """
+                    param inputa string
+
+                    extension kubernetes with {
+                      kubeConfig: ''
+                      namespace: 'default'
+                    }
+
+                    extension microsoftGraph as graph
+
+                    output outputa string = inputa
+                    """
+            };
+
+            var compilation = Services.BuildCompilation(files, mainUri);
+
+            if (scenario is "MissingExtensionConfigsDeclaration")
+            {
+                compilation.Should().ContainSingleDiagnostic("BCP035", DiagnosticLevel.Error, """The specified "module" declaration is missing the following required properties: "extensionConfigs".""");
+            }
+            else if (scenario is "MissingRequiredExtensionConfig")
+            {
+                compilation.Should().ContainSingleDiagnostic("BCP035", DiagnosticLevel.Error, """The specified "object" declaration is missing the following required properties: "kubernetes".""");
+            }
+            else if (scenario is "MissingRequiredConfigProperty")
+            {
+                compilation.Should().ContainSingleDiagnostic("BCP035", DiagnosticLevel.Error, """The specified "object" declaration is missing the following required properties: "kubeConfig".""");
+            }
+            else if (scenario is "PropertyIsNotDefinedInSchema")
+            {
+                compilation.Should().ContainSingleDiagnostic("BCP037", DiagnosticLevel.Error, """The property "extra" is not allowed on objects of type "configuration". Permissible properties include "context".""");
+            }
+            else if (scenario is "ConfigProvidedForExtensionThatDoesNotAcceptConfig")
+            {
+                compilation.Should().ContainSingleDiagnostic("BCP037", DiagnosticLevel.Error, """The property "graph" is not allowed on objects of type "extensionConfigs". No other properties are allowed.""");
+            }
+        }
     }
 }

src/Bicep.Core.IntegrationTests/ModuleTests.cs

@@ -1,16 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-using System.Collections.Immutable;
+
 using System.Diagnostics.CodeAnalysis;
-using System.Text;
-using Bicep.Core.Configuration;
 using Bicep.Core.Diagnostics;
-using Bicep.Core.Emit;
 using Bicep.Core.FileSystem;
 using Bicep.Core.Registry;
 using Bicep.Core.Semantics;
 using Bicep.Core.UnitTests;
 using Bicep.Core.UnitTests.Assertions;
+using Bicep.Core.UnitTests.Extensions;
 using Bicep.Core.UnitTests.Features;
 using Bicep.Core.UnitTests.FileSystem;
 using Bicep.Core.UnitTests.Utils;
@@ -83,10 +81,10 @@ param inputb string
 
             var compilation = Services.BuildCompilation(files, mainUri);
 
-            var (success, diagnosticsByFile) = GetSuccessAndDiagnosticsByFile(compilation);
+            var (success, diagnosticsByFile) = compilation.GetSuccessAndDiagnosticsByBicepFile();
             diagnosticsByFile.Values.SelectMany(x => x).Should().BeEmpty();
             success.Should().BeTrue();
-            GetTemplate(compilation).Should().NotBeEmpty();
+            compilation.GetTestTemplate().Should().NotBeEmpty();
         }
 
         [TestMethod]
@@ -112,7 +110,7 @@ param inputb string
 
             var compilation = Services.BuildCompilation(files, mainUri);
 
-            var (success, diagnosticsByFile) = GetSuccessAndDiagnosticsByFile(compilation);
+            var (success, diagnosticsByFile) = compilation.GetSuccessAndDiagnosticsByBicepFile();
             diagnosticsByFile[mainUri].Should().HaveDiagnostics(new[] {
                 ("BCP094", DiagnosticLevel.Error, "This module references itself, which is not allowed."),
             });
@@ -166,7 +164,7 @@ param inputb string
 
             var compilation = Services.BuildCompilation(files, mainUri);
 
-            var (success, diagnosticsByFile) = GetSuccessAndDiagnosticsByFile(compilation);
+            var (success, diagnosticsByFile) = compilation.GetSuccessAndDiagnosticsByBicepFile();
             diagnosticsByFile[mainUri].Should().HaveDiagnostics(new[] {
                 ("BCP095", DiagnosticLevel.Error, "The file is involved in a cycle (\"/modulea.bicep\" -> \"/moduleb.bicep\" -> \"/main.bicep\")."),
             });
@@ -224,7 +222,7 @@ param inputb string
             var compiler = ServiceBuilder.Create(s => s.WithFileResolver(mockFileResolver.Object).WithDisabledAnalyzersConfiguration()).GetCompiler();
             var compilation = await compiler.CreateCompilation(mainFileUri);
 
-            var (success, diagnosticsByFile) = GetSuccessAndDiagnosticsByFile(compilation);
+            var (success, diagnosticsByFile) = compilation.GetSuccessAndDiagnosticsByBicepFile();
             diagnosticsByFile[mainFileUri].Should().HaveDiagnostics(new[] {
                 ("BCP093", DiagnosticLevel.Error, "File path \"modulea.bicep\" could not be resolved relative to \"/path/to/main.bicep\"."),
             });
@@ -296,11 +294,11 @@ param inputb int
 
             var compilation = Services.BuildCompilation(files, mainUri);
 
-            var (success, diagnosticsByFile) = GetSuccessAndDiagnosticsByFile(compilation);
+            var (success, diagnosticsByFile) = compilation.GetSuccessAndDiagnosticsByBicepFile();
             diagnosticsByFile.Values.SelectMany(x => x).Should().BeEmpty();
             success.Should().BeTrue();
 
-            var templateString = GetTemplate(compilation);
+            var templateString = compilation.GetTestTemplate();
             var template = JToken.Parse(templateString);
             template.Should().NotBeNull();
 
@@ -366,7 +364,7 @@ param inputb string
             var compiler = ServiceBuilder.Create(s => s.WithFileResolver(mockFileResolver.Object).WithDisabledAnalyzersConfiguration()).GetCompiler();
             var compilation = await compiler.CreateCompilation(mainUri);
 
-            var (success, diagnosticsByFile) = GetSuccessAndDiagnosticsByFile(compilation);
+            var (success, diagnosticsByFile) = compilation.GetSuccessAndDiagnosticsByBicepFile();
             diagnosticsByFile[mainUri].Should().HaveDiagnostics(new[] {
                 ("BCP091", DiagnosticLevel.Error, "An error occurred reading file. Mock read failure!"),
             });
@@ -802,31 +800,12 @@ public void Module_collection_with_generated_name_can_be_referenced_correctly(st
             result.Template.Should().HaveValueAtPath("$.outputs.allModNames.copy.input", $"[format('{symbolicNamePrefix}-{{0}}-{{1}}', range(0, 10)[copyIndex()], uniqueString('{symbolicName}', deployment().name))]");
         }
 
-        private static string GetTemplate(Compilation compilation)
-        {
-            var stringBuilder = new StringBuilder();
-            var stringWriter = new StringWriter(stringBuilder);
-
-            var emitter = new TemplateEmitter(compilation.GetEntrypointSemanticModel());
-            emitter.Emit(stringWriter);
-
-            return stringBuilder.ToString();
-        }
-
-        private static (bool success, IDictionary<Uri, ImmutableArray<IDiagnostic>> diagnosticsByFile) GetSuccessAndDiagnosticsByFile(Compilation compilation)
-        {
-            var diagnosticsByFile = compilation.GetAllDiagnosticsByBicepFile().ToDictionary(kvp => kvp.Key.Uri, kvp => kvp.Value);
-            var success = diagnosticsByFile.Values.SelectMany(x => x).All(d => !d.IsError());
-
-            return (success, diagnosticsByFile);
-        }
-
         private static void ModuleTemplateHashValidator(Compilation compilation, string expectedTemplateHash)
         {
-            var (success, diagnosticsByFile) = GetSuccessAndDiagnosticsByFile(compilation);
+            var (success, diagnosticsByFile) = compilation.GetSuccessAndDiagnosticsByBicepFile();
             diagnosticsByFile.Values.SelectMany(x => x).Should().BeEmpty();
             success.Should().BeTrue();
-            var templateString = GetTemplate(compilation);
+            var templateString = compilation.GetTestTemplate();
             var template = JToken.Parse(templateString);
             template.Should().NotBeNull();
             template.SelectToken(BicepTestConstants.GeneratorTemplateHashPath)?.ToString().Should().Be(expectedTemplateHash);

src/Bicep.Core.Samples/BaselineData_Bicepparam.cs

@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 using System.Reflection;
 using Bicep.Core.UnitTests.Baselines;
 using FluentAssertions;
@@ -98,6 +99,7 @@ private static IEnumerable<BaselineData_Bicepparam> GetAllExampleData()
             // ensure this list is kept up-to-date to validate that we're picking all of the baseline tests
             embeddedFiles.Select(x => x.StreamPath).Should().BeEquivalentTo(
                 "Files/baselines_bicepparam/Expressions/parameters.bicepparam",
+                "Files/baselines_bicepparam/Extensions/parameters.bicepparam",
                 "Files/baselines_bicepparam/Imports/parameters.bicepparam",
                 "Files/baselines_bicepparam/Extends/parameters.bicepparam",
                 "Files/baselines_bicepparam/Invalid_Expressions/parameters.bicepparam",

src/Bicep.Core.Samples/DataSets.cs

@@ -18,6 +18,8 @@ public static class DataSets
 
         public static DataSet Empty => CreateDataSet();
 
+        public static DataSet Extensions_CRLF => CreateDataSet();
+
         public static DataSet Functions_LF => CreateDataSet();
 
         public static DataSet Imports_LF => CreateDataSet();

src/Bicep.Core.Samples/Files/baselines/Extensions_CRLF/bicepconfig.json

@@ -0,0 +1,5 @@
+{
+  "experimentalFeaturesEnabled": {
+    "extensibility": true
+  }
+}

src/Bicep.Core.Samples/Files/baselines/Extensions_CRLF/child/hasConfigurableExtensionsWithAlias.bicep

@@ -0,0 +1,6 @@
+extension kubernetes with {
+  kubeConfig: 'DELETE'
+  namespace: 'DELETE'
+} as k8s
+
+extension 'br:mcr.microsoft.com/bicep/extensions/microsoftgraph/v1.0:0.1.8-preview' as graph

src/Bicep.Core.Samples/Files/baselines/Extensions_CRLF/child/hasConfigurableExtensionsWithoutAlias.bicep

@@ -0,0 +1,6 @@
+extension kubernetes with {
+  kubeConfig: 'DELETE'
+  namespace: 'DELETE'
+}
+
+extension 'br:mcr.microsoft.com/bicep/extensions/microsoftgraph/v1.0:0.1.8-preview'

src/Bicep.Core.Samples/Files/baselines/Extensions_CRLF/main.bicep

@@ -0,0 +1,34 @@
+// BEGIN: Extension declarations
+
+extension kubernetes with {
+  kubeConfig: 'DELETE'
+  namespace: 'DELETE'
+} as k8s
+
+extension 'br:mcr.microsoft.com/bicep/extensions/microsoftgraph/v1.0:0.1.8-preview' as graph
+
+// END: Extension declarations
+
+// BEGIN: Extension configs for modules
+
+module moduleWithExtsWithAliases 'child/hasConfigurableExtensionsWithAlias.bicep' = {
+  name: 'moduleWithExtsWithAliases'
+  extensionConfigs: {
+    k8s: {
+      kubeConfig: 'kubeConfig2FromModule'
+      namespace: 'ns2FromModule'
+    }
+  }
+}
+
+module moduleWithExtsWithoutAliases 'child/hasConfigurableExtensionsWithoutAlias.bicep' = {
+  name: 'moduleWithExtsWithoutAlaises'
+  extensionConfigs: {
+    kubernetes: {
+      kubeConfig: 'kubeConfig2FromModule'
+      namespace: 'ns2FromModule'
+    }
+  }
+}
+
+// END: Extension configs for modules