Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AzResourceTypeFactory cache key to take account of required flags #13535

Merged
merged 2 commits into from Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
53 changes: 53 additions & 0 deletions src/Bicep.Core.IntegrationTests/ScenarioTests.cs
Expand Up @@ -5845,4 +5845,57 @@ public void Test_Issue13462()

result.ExcludingLinterDiagnostics().Should().NotHaveAnyDiagnostics();
}

// https://github.com/Azure/bicep/issues/13534
[TestMethod]
public void Test_Issue13534()
{
var result = CompilationHelper.Compile("""
var username = ''
var password = ''
var fileshareConnection = {
name: ''
authType: ''
rootfolder: ''
odgw: {
name: ''
resourceGroup: ''
}
}

var general = {
location: ''
}

resource resFileshareConnection 'Microsoft.Web/connections@2016-06-01' = {
name: fileshareConnection.name
location: general.location
kind: 'V2'
properties: {
displayName: fileshareConnection.name
customParameterValues: {}
parameterValues: {
rootfolder: fileshareConnection.rootfolder
authType: fileshareConnection.authType
gateway: {
name: fileshareConnection.odgw.name
id: resourceId(fileshareConnection.odgw.resourceGroup, 'Microsoft.Web/connectionGateways', fileshareConnection.odgw.name)
type: 'Microsoft.Web/connectionGateways'
}
username: username
password: password
}
api: {
id: subscriptionResourceId('Microsoft.Web/locations/managedApis', general.location, 'filesystem')
}
}
}
""");

result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
{
("BCP187", DiagnosticLevel.Warning, """The property "kind" does not exist in the resource or type definition, although it might still be valid. If this is an inaccuracy in the documentation, please report it to the Bicep Team."""),
("BCP036", DiagnosticLevel.Warning, """The property "gateway" expected a value of type "string" but the provided value is of type "object"."""),
});
}
}
Expand Up @@ -9,7 +9,7 @@ namespace Bicep.Core.TypeSystem.Providers.Az
{
public class AzResourceTypeFactory
{
private readonly ConcurrentDictionary<Azure.Bicep.Types.Concrete.TypeBase, TypeSymbol> typeCache;
private readonly ConcurrentDictionary<(Azure.Bicep.Types.Concrete.TypeBase definedType, bool isResourceBodyType, bool isResourceBodyTopLevelPropertyType), TypeSymbol> typeCache;

public AzResourceTypeFactory()
{
Expand Down Expand Up @@ -57,7 +57,8 @@ public IEnumerable<FunctionOverload> GetResourceFunctionOverloads(Azure.Bicep.Ty
}

private TypeSymbol GetTypeSymbol(Azure.Bicep.Types.Concrete.TypeBase serializedType, bool isResourceBodyType, bool isResourceBodyTopLevelPropertyType)
=> typeCache.GetOrAdd(serializedType, serializedType => ToTypeSymbol(serializedType, isResourceBodyType, isResourceBodyTopLevelPropertyType));
=> typeCache.GetOrAdd((serializedType, isResourceBodyType, isResourceBodyTopLevelPropertyType),
jeskew marked this conversation as resolved.
Show resolved Hide resolved
t => ToTypeSymbol(t.definedType, t.isResourceBodyType, t.isResourceBodyTopLevelPropertyType));

private ITypeReference GetTypeReference(Azure.Bicep.Types.Concrete.ITypeReference input, bool isResourceBodyType, bool isResourceBodyTopLevelPropertyType)
=> new DeferredTypeReference(() => GetTypeSymbol(input.Type, isResourceBodyType, isResourceBodyTopLevelPropertyType));
Expand Down