Merge branch 'main' of https://github.com/Azure/bicep into asilverman…

…/central-mgmt-providers
Azure · Mar 5, 2024 · 6d061b4 · 6d061b4
2 parents 71ec14b + b41394e
commit 6d061b4
Show file tree

Hide file tree

Showing 321 changed files with 6,885 additions and 6,707 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -30,5 +30,7 @@
       "version": "lts",
       "nodeGypDependencies": true
     }
-  }
+  },
+  "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", "--privileged" ],
+  "postAttachCommand": "sudo bash -c \"echo 0 > /proc/sys/kernel/yama/ptrace_scope\""
 }
diff --git a/docs/release-checklist.md b/docs/release-checklist.md
@@ -2,7 +2,8 @@
 
 1. (**end-of-month releases only**) Update Bicep Az types:
     1. Run the [Update Types](https://github.com/Azure/bicep-types-az/actions/workflows/update-types.yml) GitHub Action to generate the latest type definitions.
-        1. Wait ~3hrs for it to complete. Ensure it runs successfully and that it generates + merges a PR (example [here](https://github.com/Azure/bicep-types-az/pull/1299)).
+        1. Wait ~3hrs for it to complete. Ensure it runs successfully.
+        2. Submit a PR to merge the `autogenerate` branch to `main`. You can use [this link](https://github.com/Azure/bicep-types-az/compare/main...autogenerate) to start the PR.
     1. Run the Official Build for BicepMirror-Types-Az(see [this README](https://msazure.visualstudio.com/One/_git/BicepMirror-Types-Az) for instructions).
         Note: There are several (non-blocking) known issues:
           - https://msazure.visualstudio.com/One/_workitems/edit/25142078

diff --git a/src/Bicep.Cli.E2eTests/package-lock.json b/src/Bicep.Cli.E2eTests/package-lock.json
diff --git a/src/Bicep.Cli.E2eTests/package.json b/src/Bicep.Cli.E2eTests/package.json
@@ -8,7 +8,7 @@
     "@types/rimraf": "^4.0.5",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^7.0.2",
-    "@typescript-eslint/parser": "^7.0.2",
+    "@typescript-eslint/parser": "^7.1.0",
     "cross-env": "^7.0.3",
     "cross-spawn": "^7.0.3",
     "eslint": "^8.57.0",

diff --git a/src/Bicep.Cli.IntegrationTests/Bicep.Cli.IntegrationTests.csproj b/src/Bicep.Cli.IntegrationTests/Bicep.Cli.IntegrationTests.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Bicep.Cli.IntegrationTests/CliScenarioTests.cs b/src/Bicep.Cli.IntegrationTests/CliScenarioTests.cs
@@ -180,10 +180,7 @@ public async Task Test_Issue3182()
                 resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-04-01-preview' = {
                   name: guid(roleAssignmentName)
                   properties: {
-                    roleDefinitionId: subscriptionResourceId(
-                      'Microsoft.Authorization/roleDefinitions',
-                      roleDefinitionId
-                    )
+                    roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', roleDefinitionId)
                     principalId: principalId
                   }
                 }

diff --git a/src/Bicep.Cli.IntegrationTests/DecompileParamsCommandTests.cs b/src/Bicep.Cli.IntegrationTests/DecompileParamsCommandTests.cs
@@ -57,7 +57,10 @@ public async Task Decompile_ValidParamFile_ShouldSucceed()
 
                 param second = 1
 
-                param third = [1, 'foo']
+                param third = [
+                  1
+                  'foo'
+                ]
 
                 param fourth = {
                   firstKey: 'bar'

diff --git a/src/Bicep.Cli.IntegrationTests/packages.lock.json b/src/Bicep.Cli.IntegrationTests/packages.lock.json
@@ -4,9 +4,9 @@
     "net8.0": {
       "coverlet.collector": {
         "type": "Direct",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ=="
+        "requested": "[6.0.1, )",
+        "resolved": "6.0.1",
+        "contentHash": "q/8r0muHlF7TbhMUTBAk43KteZYG2ECV96pbzkToQwgjp3BvbS766svUcO6va+cohWOkigeBWmHs0Vu5vQnESA=="
       },
       "FluentAssertions": {
         "type": "Direct",
@@ -82,8 +82,8 @@
       },
       "Azure.Bicep.Types.Az": {
         "type": "Transitive",
-        "resolved": "0.2.675",
-        "contentHash": "tTj/kbXmtPIbNW2/TwuWpRQ1cV528FZf/sP3kYkh9XrHJEuQ4PLLuGBTVF5/qVvJ613lTekDAmUj7cXaNXVH1A==",
+        "resolved": "0.2.677",
+        "contentHash": "OPpNWvgo7VArxDSOrGVGqG1z37rorVeaNyk/8U1g/xFtcrOR2fn7BOQYhq4IGhbpgI4DTJTIUMjZp8yPilFhLA==",
         "dependencies": {
           "Azure.Bicep.Types": "0.5.6"
         }
@@ -2164,7 +2164,7 @@
         "type": "Project",
         "dependencies": {
           "Azure.Bicep.Types": "[0.5.6, )",
-          "Azure.Bicep.Types.Az": "[0.2.675, )",
+          "Azure.Bicep.Types.Az": "[0.2.677, )",
           "Azure.Bicep.Types.K8s": "[0.1.626, )",
           "Azure.Containers.ContainerRegistry": "[1.1.1, )",
           "Azure.Deployments.Core": "[1.0.1158, )",

diff --git a/src/Bicep.Cli.UnitTests/Bicep.Cli.UnitTests.csproj b/src/Bicep.Cli.UnitTests/Bicep.Cli.UnitTests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Bicep.Cli.UnitTests/packages.lock.json b/src/Bicep.Cli.UnitTests/packages.lock.json
@@ -4,9 +4,9 @@
     "net8.0": {
       "coverlet.collector": {
         "type": "Direct",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ=="
+        "requested": "[6.0.1, )",
+        "resolved": "6.0.1",
+        "contentHash": "q/8r0muHlF7TbhMUTBAk43KteZYG2ECV96pbzkToQwgjp3BvbS766svUcO6va+cohWOkigeBWmHs0Vu5vQnESA=="
       },
       "FluentAssertions": {
         "type": "Direct",
@@ -82,8 +82,8 @@
       },
       "Azure.Bicep.Types.Az": {
         "type": "Transitive",
-        "resolved": "0.2.675",
-        "contentHash": "tTj/kbXmtPIbNW2/TwuWpRQ1cV528FZf/sP3kYkh9XrHJEuQ4PLLuGBTVF5/qVvJ613lTekDAmUj7cXaNXVH1A==",
+        "resolved": "0.2.677",
+        "contentHash": "OPpNWvgo7VArxDSOrGVGqG1z37rorVeaNyk/8U1g/xFtcrOR2fn7BOQYhq4IGhbpgI4DTJTIUMjZp8yPilFhLA==",
         "dependencies": {
           "Azure.Bicep.Types": "0.5.6"
         }
@@ -1983,7 +1983,7 @@
         "type": "Project",
         "dependencies": {
           "Azure.Bicep.Types": "[0.5.6, )",
-          "Azure.Bicep.Types.Az": "[0.2.675, )",
+          "Azure.Bicep.Types.Az": "[0.2.677, )",
           "Azure.Bicep.Types.K8s": "[0.1.626, )",
           "Azure.Containers.ContainerRegistry": "[1.1.1, )",
           "Azure.Deployments.Core": "[1.0.1158, )",

diff --git a/src/Bicep.Cli/Commands/PublishCommand.cs b/src/Bicep.Cli/Commands/PublishCommand.cs
@@ -93,7 +93,7 @@ public async Task<int> RunAsync(PublishArguments args)
 
                 await ioContext.Output.WriteLineAsync(string.Format(CliResources.ExperimentalFeaturesDisclaimerMessage, PublishSourceFeatureName));
 
-                sourcesStream = SourceArchive.PackSourcesIntoStream(compilation.SourceFileGrouping, features.CacheRootDirectory);
+                sourcesStream = SourceArchive.PackSourcesIntoStream(moduleDispatcher, compilation.SourceFileGrouping, features.CacheRootDirectory);
                 Trace.WriteLine("Publishing Bicep module with source");
             }
             else

diff --git a/src/Bicep.Cli/packages.lock.json b/src/Bicep.Cli/packages.lock.json
@@ -97,8 +97,8 @@
       },
       "Azure.Bicep.Types.Az": {
         "type": "Transitive",
-        "resolved": "0.2.675",
-        "contentHash": "tTj/kbXmtPIbNW2/TwuWpRQ1cV528FZf/sP3kYkh9XrHJEuQ4PLLuGBTVF5/qVvJ613lTekDAmUj7cXaNXVH1A==",
+        "resolved": "0.2.677",
+        "contentHash": "OPpNWvgo7VArxDSOrGVGqG1z37rorVeaNyk/8U1g/xFtcrOR2fn7BOQYhq4IGhbpgI4DTJTIUMjZp8yPilFhLA==",
         "dependencies": {
           "Azure.Bicep.Types": "0.5.6"
         }
@@ -1881,7 +1881,7 @@
         "type": "Project",
         "dependencies": {
           "Azure.Bicep.Types": "[0.5.6, )",
-          "Azure.Bicep.Types.Az": "[0.2.675, )",
+          "Azure.Bicep.Types.Az": "[0.2.677, )",
           "Azure.Bicep.Types.K8s": "[0.1.626, )",
           "Azure.Containers.ContainerRegistry": "[1.1.1, )",
           "Azure.Deployments.Core": "[1.0.1158, )",

diff --git a/src/Bicep.Core.IntegrationTests/Bicep.Core.IntegrationTests.csproj b/src/Bicep.Core.IntegrationTests/Bicep.Core.IntegrationTests.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Bicep.Core.IntegrationTests/CentralizedProviderVersionManagementTests.cs b/src/Bicep.Core.IntegrationTests/CentralizedProviderVersionManagementTests.cs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using Bicep.Core.Diagnostics;
 using Bicep.Core.UnitTests;
+using Bicep.Core.UnitTests.Assertions;
 using Bicep.Core.UnitTests.Utils;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Bicep.Core.UnitTests.Assertions;
-using Bicep.Core.Diagnostics;
 
 namespace Bicep.Core.IntegrationTests
 {

diff --git a/src/Bicep.Core.IntegrationTests/CompileTimeImportTests.cs b/src/Bicep.Core.IntegrationTests/CompileTimeImportTests.cs
@@ -1,18 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 using System.Diagnostics.CodeAnalysis;
-using Bicep.Core.Configuration;
 using Bicep.Core.Diagnostics;
 using Bicep.Core.Emit;
-using Bicep.Core.Features;
 using Bicep.Core.UnitTests;
 using Bicep.Core.UnitTests.Assertions;
-using Bicep.Core.UnitTests.Features;
-using Bicep.Core.UnitTests.Mock;
 using Bicep.Core.UnitTests.Utils;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
 using Newtonsoft.Json.Linq;
 
 namespace Bicep.Core.IntegrationTests;