Skip to content

Commit

Permalink
Sort (and deduplicate) type aliases (#3902)
Browse files Browse the repository at this point in the history 
- Use a set to ensure we don't add duplicate aliases.
- Render the aliases ordered.

This just affects explicit versions, moving the default version from the
first alias to the last in the list.

This will allow us to add additional sources of aliases (from the
previous major version) without causing duplicates.
  • Loading branch information
@danielrbradley
danielrbradley authored Jan 29, 2025
1 parent 0a344cb commit d57cb26
Show file tree
Hide file tree
Showing 26,024 changed files with 26,163 additions and 26,163 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
150 changes: 75 additions & 75 deletions provider/cmd/pulumi-resource-azure-native/schema.json
View file

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions provider/pkg/gen/schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/go-openapi/spec"
"github.com/pkg/errors"

"github.com/pulumi/pulumi-azure-native/v2/provider/pkg/collections"
"github.com/pulumi/pulumi-azure-native/v2/provider/pkg/openapi"
"github.com/pulumi/pulumi-azure-native/v2/provider/pkg/openapi/paths"
"github.com/pulumi/pulumi-azure-native/v2/provider/pkg/resources"
Expand Down Expand Up @@ -1037,47 +1038,46 @@ func isSingleton(resource *resourceVariant) bool {
}

func (g *packageGenerator) generateAliases(resource *resourceVariant, typeNameAliases ...string) []pschema.AliasSpec {
var aliases []pschema.AliasSpec

addAlias := func(module openapi.ModuleName, typeName string, version openapi.SdkVersion) {
alias := generateTok(module, typeName, version)
aliases = append(aliases, pschema.AliasSpec{Type: &alias})
}
typeAliases := collections.NewOrderableSet[string]()

// Add an alias for the same version of the resource, but in its old module.
if resource.ModuleNaming.PreviousName != nil {
addAlias(*resource.ModuleNaming.PreviousName, resource.typeName, g.sdkVersion)
typeAliases.Add(generateTok(*resource.ModuleNaming.PreviousName, resource.typeName, g.sdkVersion))
}

for _, alias := range typeNameAliases {
addAlias(g.moduleName, alias, g.sdkVersion)
typeAliases.Add(generateTok(g.moduleName, alias, g.sdkVersion))
// Add an alias for the same alias, but in its old module.
if resource.ModuleNaming.PreviousName != nil {
addAlias(*resource.ModuleNaming.PreviousName, alias, g.sdkVersion)
typeAliases.Add(generateTok(*resource.ModuleNaming.PreviousName, alias, g.sdkVersion))
}
}

// Add an alias for each API version that has the same path in it.
for _, version := range resource.CompatibleVersions {
addAlias(g.moduleName, resource.typeName, version.ToSdkVersion())
typeAliases.Add(generateTok(g.moduleName, resource.typeName, version.ToSdkVersion()))

// Add an alias for the other versions, but from its old module.
if resource.ModuleNaming.PreviousName != nil {
addAlias(*resource.ModuleNaming.PreviousName, resource.typeName, version.ToSdkVersion())
typeAliases.Add(generateTok(*resource.ModuleNaming.PreviousName, resource.typeName, version.ToSdkVersion()))
}

// Add type name aliases for each compatible version.
for _, alias := range typeNameAliases {
addAlias(g.moduleName, alias, version.ToSdkVersion())
typeAliases.Add(generateTok(g.moduleName, alias, version.ToSdkVersion()))

// Add an alias for the other version, with alias, from its old module.
if resource.ModuleNaming.PreviousName != nil {
addAlias(*resource.ModuleNaming.PreviousName, alias, version.ToSdkVersion())
typeAliases.Add(generateTok(*resource.ModuleNaming.PreviousName, alias, version.ToSdkVersion()))
}
}
}

return aliases
var aliasSpecs []pschema.AliasSpec
for _, v := range typeAliases.SortedValues() {
aliasSpecs = append(aliasSpecs, pschema.AliasSpec{Type: &v})
}
return aliasSpecs
}

func (g *packageGenerator) generateExampleReferences(resourceTok string, path *spec.PathItem, swagger *openapi.Spec) error {
Expand Down Expand Up @@ -1244,7 +1244,7 @@ func (g *packageGenerator) formatDescription(desc string, typeName string, defau
if g.sdkVersion == "" {
fmt.Fprintf(&b, "\nAzure REST API version: %s.", defaultVersion)
if previousDefaultVersion != "" {
fmt.Fprintf(&b, " Prior API version in Azure Native %d.x: %s.", g.majorVersion - 1, previousDefaultVersion)
fmt.Fprintf(&b, " Prior API version in Azure Native %d.x: %s.", g.majorVersion-1, previousDefaultVersion)
}

// List other available API versions, if any.
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20200320/Cluster.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20220501:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs:Cluster" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20210101Preview/Addon.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20220501:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs:Addon" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20210101Preview/WorkloadNetworkDhcp.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20220501:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs:WorkloadNetworkDhcp" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20210601/Cluster.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200320:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20220501:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs:Cluster" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/Addon.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:Addon" },
new global::Pulumi.Alias { Type = "azure-native:avs:Addon" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/Authorization.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:Authorization" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200320:Authorization" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:Authorization" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:Authorization" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:Authorization" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:Authorization" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:Authorization" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:Authorization" },
new global::Pulumi.Alias { Type = "azure-native:avs:Authorization" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/CloudLink.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:CloudLink" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:CloudLink" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:CloudLink" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:CloudLink" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:CloudLink" },
new global::Pulumi.Alias { Type = "azure-native:avs:CloudLink" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/Cluster.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200320:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:Cluster" },
new global::Pulumi.Alias { Type = "azure-native:avs:Cluster" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/Datastore.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:Datastore" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:Datastore" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:Datastore" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:Datastore" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:Datastore" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:Datastore" },
new global::Pulumi.Alias { Type = "azure-native:avs:Datastore" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/GlobalReachConnection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:GlobalReachConnection" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:GlobalReachConnection" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:GlobalReachConnection" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:GlobalReachConnection" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:GlobalReachConnection" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:GlobalReachConnection" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:GlobalReachConnection" },
new global::Pulumi.Alias { Type = "azure-native:avs:GlobalReachConnection" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/HcxEnterpriseSite.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:HcxEnterpriseSite" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200320:HcxEnterpriseSite" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:HcxEnterpriseSite" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:HcxEnterpriseSite" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:HcxEnterpriseSite" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:HcxEnterpriseSite" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:HcxEnterpriseSite" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:HcxEnterpriseSite" },
new global::Pulumi.Alias { Type = "azure-native:avs:HcxEnterpriseSite" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/PlacementPolicy.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:PlacementPolicy" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:PlacementPolicy" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:PlacementPolicy" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:PlacementPolicy" },
new global::Pulumi.Alias { Type = "azure-native:avs:PlacementPolicy" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/PrivateCloud.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,14 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:PrivateCloud" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200320:PrivateCloud" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:PrivateCloud" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:PrivateCloud" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:PrivateCloud" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:PrivateCloud" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:PrivateCloud" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:PrivateCloud" },
new global::Pulumi.Alias { Type = "azure-native:avs:PrivateCloud" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/ScriptExecution.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:ScriptExecution" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:ScriptExecution" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:ScriptExecution" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:ScriptExecution" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:ScriptExecution" },
new global::Pulumi.Alias { Type = "azure-native:avs:ScriptExecution" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/AVS/V20220501/WorkloadNetworkDhcp.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
Version = Utilities.Version,
Aliases =
{
new global::Pulumi.Alias { Type = "azure-native:avs:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20200717preview:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210101preview:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20210601:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20211201:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230301:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs/v20230901:WorkloadNetworkDhcp" },
new global::Pulumi.Alias { Type = "azure-native:avs:WorkloadNetworkDhcp" },
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
Expand Down
Loading

0 comments on commit d57cb26

Please sign in to comment.