Clean up some import-related loose ends (#8858)

* Clean up some import-related loose ends

* Add test methods for lambda bug

* Rename feature "Imports" -> "Extensibility"

Author: anthony-c-martin

src/Bicep.Core.IntegrationTests/EvaluationTests.cs

@@ -600,5 +600,142 @@ param numbers array
                 evaluated.Should().HaveValueAtPath("$.variables['reduceEmpty']", 0);
             }
         }
+
+        /// <summary>
+        /// https://github.com/Azure/bicep/issues/8782
+        /// </summary>
+        [TestMethod]
+        public void Issue8782()
+        {
+            var result = CompilationHelper.Compile(@"
+var testArray = [
+  {
+    property1: 'test'
+    property2: 1
+  }
+  {
+    property1: 'dev'
+    property2: 2
+  }
+  {
+    property1: 'test'
+    property2: 0
+  }
+  {
+    property1: 'prod'
+    property2: 1
+  }
+  {
+    property1: 'prod'
+    property2: 0
+  }
+  {
+    property1: 'dev'
+    property2: 0
+  }
+  {
+    property1: 'test'
+    property2: 0
+  }
+]
+
+output testMap array = map(testArray, record => {
+  result: record.property2 > 0 ? record.property1 : record.property1 =~ 'test' ? 'test!' : 'notTest!'
+})
+
+output testFor array = [for record in testArray: {
+  result: record.property2 > 0 ? record.property1 : record.property1 =~ 'test' ? 'test!' : 'notTest!'
+}]
+");
+
+            var evaluated = TemplateEvaluator.Evaluate(result.Template);
+            evaluated.Should().HaveValueAtPath("$.outputs['testMap'].value", JToken.Parse(@"
+[
+  {
+    ""result"": ""test""
+  },
+  {
+    ""result"": ""dev""
+  },
+  {
+    ""result"": ""test!""
+  },
+  {
+    ""result"": ""prod""
+  },
+  {
+    ""result"": ""notTest!""
+  },
+  {
+    ""result"": ""notTest!""
+  },
+  {
+    ""result"": ""test!""
+  }
+]
+"));
+        }
+
+        /// <summary>
+        /// https://github.com/Azure/bicep/issues/8798
+        /// </summary>
+        [TestMethod]
+        public void Issue8798()
+        {
+            var result = CompilationHelper.Compile(@"
+var dogs = [
+  {
+    name: 'Evie'
+    age: 5
+    interests: ['Ball', 'Frisbee']
+  }
+  {
+    name: 'Casper'
+    age: 3
+    interests: ['Other dogs']
+  }
+  {
+    name: 'Indy'
+    age: 2
+    interests: ['Butter']
+  }
+  {
+    name: 'Kira'
+    age: 8
+    interests: ['Rubs']
+  }
+]
+
+output iDogs array = filter(dogs, dog =>  (contains(dog.name, 'C') || contains(dog.name, 'i')))
+");
+
+            var evaluated = TemplateEvaluator.Evaluate(result.Template);
+            evaluated.Should().HaveValueAtPath("$.outputs['iDogs'].value", JToken.Parse(@"
+[
+  {
+    ""name"": ""Evie"",
+    ""age"": 5,
+    ""interests"": [
+      ""Ball"",
+      ""Frisbee""
+    ]
+  },
+  {
+    ""name"": ""Casper"",
+    ""age"": 3,
+    ""interests"": [
+      ""Other dogs""
+    ]
+  },
+  {
+    ""name"": ""Kira"",
+    ""age"": 8,
+    ""interests"": [
+      ""Rubs""
+    ]
+  }
+]
+"));
+        }
     }
 }

src/Bicep.Core.IntegrationTests/ExamplesTests.cs

@@ -91,7 +91,7 @@ public void ExampleIsValid_using_experimental_symbolic_names(EmbeddedFile embedd
         [DynamicData(nameof(GetExtensibilityExampleData), DynamicDataSourceType.Method)]
         [TestCategory(BaselineHelper.BaselineTestCategory)]
         public void ExampleIsValid_extensibility(EmbeddedFile embeddedBicep)
-            => RunExampleTest(embeddedBicep, new(ImportsEnabled: true), ".json");
+            => RunExampleTest(embeddedBicep, new(ExtensibilityEnabled: true), ".json");
 
         [DataTestMethod]
         [DynamicData(nameof(GetAllExampleData), DynamicDataSourceType.Method)]

src/Bicep.Core.IntegrationTests/ExtensibilityTests.cs

@@ -19,7 +19,7 @@ public class ExtensibilityTests
         public TestContext? TestContext { get; set; }
 
         private ServiceBuilder Services => new ServiceBuilder()
-            .WithFeatureOverrides(new(ImportsEnabled: true))
+            .WithFeatureOverrides(new(ExtensibilityEnabled: true))
             .WithNamespaceProvider(new TestExtensibilityNamespaceProvider(BicepTestConstants.AzResourceTypeLoader));
 
         [TestMethod]

src/Bicep.Core.IntegrationTests/ImportTests.cs

@@ -21,7 +21,7 @@ namespace Bicep.Core.IntegrationTests
     public class ImportTests
     {
         private ServiceBuilder ServicesWithImports => new ServiceBuilder()
-            .WithFeatureOverrides(new(TestContext, ImportsEnabled: true));
+            .WithFeatureOverrides(new(TestContext, ExtensibilityEnabled: true));
 
         private class TestNamespaceProvider : INamespaceProvider
         {
@@ -54,7 +54,7 @@ public void Imports_are_disabled_unless_feature_is_enabled()
 import '[email protected]'
 ");
             result.Should().HaveDiagnostics(new[] {
-                ("BCP203", DiagnosticLevel.Error, "Import statements are currently not supported."),
+                ("BCP203", DiagnosticLevel.Error, "Using import statements requires enabling EXPERIMENTAL feature \"Extensibility\"."),
             });
         }
 

src/Bicep.Core.IntegrationTests/OutputsTests.cs

@@ -22,7 +22,7 @@ public class OutputsTests
         public TestContext? TestContext { get; set; }
 
         private ServiceBuilder ServicesWithExtensibility => new ServiceBuilder()
-            .WithFeatureOverrides(new(TestContext, ImportsEnabled: true, ResourceTypedParamsAndOutputsEnabled: true))
+            .WithFeatureOverrides(new(TestContext, ExtensibilityEnabled: true, ResourceTypedParamsAndOutputsEnabled: true))
             .WithNamespaceProvider(new TestExtensibilityNamespaceProvider(BicepTestConstants.AzResourceTypeLoader));
 
         [TestMethod]

src/Bicep.Core.IntegrationTests/ParametersTests.cs

@@ -24,7 +24,7 @@ public class ParameterTests
         public TestContext? TestContext { get; set; }
 
         private ServiceBuilder ServicesWithExtensibility => new ServiceBuilder()
-            .WithFeatureOverrides(new(TestContext, ImportsEnabled: true, ResourceTypedParamsAndOutputsEnabled: true))
+            .WithFeatureOverrides(new(TestContext, ExtensibilityEnabled: true, ResourceTypedParamsAndOutputsEnabled: true))
             .WithNamespaceProvider(new TestExtensibilityNamespaceProvider(BicepTestConstants.AzResourceTypeLoader));
 
         [TestMethod]

src/Bicep.Core.Samples/Files/Modules_CRLF/child/folder with separate config/bicepconfig.json

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

src/Bicep.Core.Samples/Files/user_submitted/extensibility/aks/bicepconfig.json

@@ -1,15 +1,7 @@
-# In order to use this functionality, you must first have been enrolled in the extensibility preview.
-# You will also need to ensure you've set the BICEP_IMPORTS_ENABLED_EXPERIMENTAL env var to 'true' in both VSCode and your CLI environment.
-
 $baseName="majastrzkub"
 $adminUsername="marcin"
 $sshRSAPublicKey = Get-Content "~\.ssh\id_rsa.pub";
 
-$env:BICEP_IMPORTS_ENABLED_EXPERIMENTAL = 'true'
-
-Select-AzSubscription 996a2f3f-ee01-4ffd-9765-d2c3fc98f30a
-
-# end-to-end deployment
 New-AzSubscriptionDeployment `
   -Name $baseName `
   -Location 'West Central US' `
@@ -19,15 +11,4 @@ New-AzSubscriptionDeployment `
     dnsPrefix = $baseName;
     linuxAdminUsername = $adminUsername;
     sshRSAPublicKey = $sshRSAPublicKey;
-  }
-
-# deploy kubernetes resources individually
-$kubeConfig = ''
-
-New-AzResourceGroupDeployment `
-  -Name "$baseName-voteapp" `
-  -TemplateFile '.\modules/kubernetes.bicep' `
-  -ResourceGroupName $baseName `
-  -TemplateParameterObject @{
-    kubeConfig = $kubeConfig
   }

src/Bicep.Core.Samples/Files/user_submitted/extensibility/aks/deploy.ps1

@@ -1,10 +1,7 @@
 #!/bin/bash
 # Deploys main.bicep in this folder
 
-# Enable Azure CLI & VSCode for extensibility
-export BICEP_IMPORTS_ENABLED_EXPERIMENTAL=true
-
-scriptPath=$(dirname "$0")
+scriptPath=$(dirname -- "$0")
 baseName="bicepkubedemo"
 adminUsername="anthony"