-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into lukehoban/moreesm
- Loading branch information
Showing
26 changed files
with
713 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,9 @@ | ||
### Improvements | ||
|
||
- [engine] - Interpret `pluginDownloadURL` as the provider host url when | ||
downloading plugins. | ||
[#8544](https://github.com/pulumi/pulumi/pull/8544) | ||
|
||
- [sdk/dotnet] - `InputMap` and `InputList` can now be initialized | ||
with any value that implicitly converts to the collection type. | ||
These values are then automatically appended, for example: | ||
|
||
var list = new InputList<string> | ||
{ | ||
"V1", | ||
Output.Create("V2"), | ||
new[] { "V3", "V4" }, | ||
new List<string> { "V5", "V6" }, | ||
Output.Create(ImmutableArray.Create("V7", "V8")) | ||
}; | ||
|
||
This feature simplifies the syntax for constructing resources and | ||
specifying resource options such as the `DependsOn` option. | ||
|
||
[#8498](https://github.com/pulumi/pulumi/pull/8498) | ||
|
||
- [sdk/nodejs] Support using native ES modules as Pulumi scripts | ||
[#7764](https://github.com/pulumi/pulumi/pull/7764) | ||
|
||
### Bug Fixes | ||
|
||
- [sdk/python] - Fixes an issue with stack outputs persisting after | ||
they are removed from the Pulumi program | ||
[#8583](https://github.com/pulumi/pulumi/pull/8583) | ||
- [sdk/nodejs] Support a `nodeargs` option for passing `node` arguments to the Node language host | ||
[#8655](https://github.com/pulumi/pulumi/pull/8655) | ||
|
||
- [auto/*] - Fixes `stack.setConfig()` breaking when trying to set | ||
values that look like flags (such as `-value`) | ||
[#8518](https://github.com/pulumi/pulumi/pull/8614) | ||
|
||
- [sdk/dotnet] - Don't throw converting value types that don't match schema | ||
[#8628](https://github.com/pulumi/pulumi/pull/8628) | ||
### Bug Fixes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
|
||
using Pulumi; | ||
using Pulumi.Testing; | ||
|
||
namespace Pulumi.Tests.Mocks.Aliases | ||
{ | ||
class AliasesStack : Stack | ||
{ | ||
public AliasesStack() | ||
{ | ||
var parent1 = new Pulumi.CustomResource("test:resource:type", "myres1", null, new CustomResourceOptions { }); | ||
var child1 = new Pulumi.CustomResource("test:resource:child", "myres1-child", null, new CustomResourceOptions | ||
{ | ||
Parent = parent1, | ||
}); | ||
|
||
var parent2 = new Pulumi.CustomResource("test:resource:type", "myres2", null, new CustomResourceOptions { }); | ||
var child2 = new Pulumi.CustomResource("test:resource:child", "myres2-child", null, new CustomResourceOptions | ||
{ | ||
Parent = parent2, | ||
Aliases = { new Alias { Type = "test:resource:child2" } } | ||
}); | ||
|
||
var parent3 = new Pulumi.CustomResource("test:resource:type", "myres3", null, new CustomResourceOptions { }); | ||
var child3 = new Pulumi.CustomResource("test:resource:child", "myres3-child", null, new CustomResourceOptions | ||
{ | ||
Parent = parent3, | ||
Aliases = { new Alias { Name = "child2" } } | ||
}); | ||
|
||
var parent4 = new Pulumi.CustomResource("test:resource:type", "myres4", null, new CustomResourceOptions | ||
{ | ||
Aliases = { new Alias { Type = "test:resource:type3" } } | ||
}); | ||
var child4 = new Pulumi.CustomResource("test:resource:child", "myres4-child", null, new CustomResourceOptions | ||
{ | ||
Parent = parent4, | ||
Aliases = { new Alias { Name = "myres4-child2" } } | ||
}); | ||
|
||
var parent5 = new Pulumi.CustomResource("test:resource:type", "myres5", null, new CustomResourceOptions | ||
{ | ||
Aliases = { new Alias { Name = "myres52" } } | ||
}); | ||
var child5 = new Pulumi.CustomResource("test:resource:child", "myres5-child", null, new CustomResourceOptions | ||
{ | ||
Parent = parent5, | ||
Aliases = { new Alias { Name = "myres5-child2" } } | ||
}); | ||
|
||
var parent6 = new Pulumi.CustomResource("test:resource:type", "myres6", null, new CustomResourceOptions | ||
{ | ||
Aliases = { new Alias { Name = "myres62" }, new Alias { Type = "test:resource:type3"}, new Alias { Name = "myres63" }, } | ||
}); | ||
var child6 = new Pulumi.CustomResource("test:resource:child", "myres6-child", null, new CustomResourceOptions | ||
{ | ||
Parent = parent6, | ||
Aliases = { new Alias { Name = "myres6-child2" }, new Alias { Type = "test:resource:child2"} } | ||
}); | ||
} | ||
} | ||
|
||
class AliasesMocks : IMocks | ||
{ | ||
public Task<object> CallAsync(MockCallArgs args) | ||
{ | ||
return Task.FromResult<object>(args); | ||
} | ||
|
||
public async Task<(string? id, object state)> NewResourceAsync( | ||
MockResourceArgs args) | ||
{ | ||
await Task.Delay(0); | ||
return ("myID", new Dictionary<string, object>()); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.