Skip to content

Commit

Permalink
Merge pull request #113 from pulumi/stack72/v1.43.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 authored Jun 3, 2021
2 parents 7b6123a + d76a8c1 commit f637a6f
Show file tree
Hide file tree
Showing 42 changed files with 3,280 additions and 48 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CHANGELOG
=========

## HEAD (Unreleased)
_(none)_
* Upgrade to v1.46.0 of the SpotInst Terraform Provider

---

Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ clean::

install_plugins::
[ -x $(shell which pulumi) ] || curl -fsSL https://get.pulumi.com | sh
pulumi plugin install resource aws 4.1.0
pulumi plugin install resource azure 4.1.0
pulumi plugin install resource random 4.0.0

install_dotnet_sdk::
mkdir -p $(WORKING_DIR)/nuget
Expand Down
2 changes: 1 addition & 1 deletion examples/aws_elastigroup/csharp/csharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Pulumi.Aws" Version="4.*-*" />
<PackageReference Include="Pulumi.Aws" Version="4.*" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions examples/aws_elastigroup/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pulumi>=3.0.0a1,<4.0.0
pulumi_aws>=4.0.0a1,<5.0.0
pulumi>=3.0.0,<4.0.0
pulumi_aws>=4.0.0,<5.0.0
1,952 changes: 1,952 additions & 0 deletions examples/aws_elastigroup/ts/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions examples/aws_elastigroup/ts/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "typescript",
"devDependencies": {
"@types/node": "^8.0.0"
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/aws": "^4.0.0-alpha.0",
"@pulumi/pulumi": "^3.0.0-alpha.0",
"@pulumi/random": "^4.0.0-alpha.0"
"@pulumi/aws": "^4.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/random": "^4.0.0"
}
}
127 changes: 121 additions & 6 deletions provider/cmd/pulumi-resource-spotinst/schema.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
replace (
github.com/hashicorp/go-getter v1.5.0 => github.com/hashicorp/go-getter v1.4.0
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
github.com/spotinst/terraform-provider-spotinst => github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210429195502-d15ec9bf741c
github.com/spotinst/terraform-provider-spotinst => github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210603161524-8bac58c6262b
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200117160349-530e935923ad
golang.org/x/sys => golang.org/x/sys v0.0.0-20190412213103-97732733099d
)
8 changes: 8 additions & 0 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,10 @@ github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210428125936-f306bfac7
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210428125936-f306bfac77f4/go.mod h1:yMqifs88/giksXnlTY2HOuevmJiqhDR+jXl1VgJkh1E=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210429195502-d15ec9bf741c h1:8bqh/CsWNRI3CiGKBfngwvRYPLfr3DvEfRFmgKUl70A=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210429195502-d15ec9bf741c/go.mod h1:yMqifs88/giksXnlTY2HOuevmJiqhDR+jXl1VgJkh1E=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210504172624-0754182c644d h1:Tjv8+VX4+BwY2tCey08nPvC1v9iUhfouJa7nr18npJk=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210504172624-0754182c644d/go.mod h1:YkHUgat6vIIzuyyqJIpmS2m1JywCt31pRndta1dD/iw=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210603161524-8bac58c6262b h1:T5u3urfUHWfjjBc7J0Gs8inzH+ZbjRxFqpwyn57YJJg=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210603161524-8bac58c6262b/go.mod h1:dSI6prdnXj6l4KEnkkXEtm0KBz3T00rpJACkL+4503c=
github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af h1:gu+uRPtBe88sKxUCEXRoeCvVG90TJmwhiqRpvdhQFng=
Expand Down Expand Up @@ -854,6 +858,10 @@ github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
github.com/spotinst/spotinst-sdk-go v1.85.0 h1:tMXKhxfmU7BnqTnUpR2s/hEyTASfrxkgPb/3Tqn6tmM=
github.com/spotinst/spotinst-sdk-go v1.85.0/go.mod h1:RuKksd1/RyQogMCxKFI5B75NeFRcgl3W+26DVX6S4m0=
github.com/spotinst/spotinst-sdk-go v1.86.0 h1:52oFqTav1Mi+iVfhqliNXgVXMpbhXBxnWO+LlTzxeOw=
github.com/spotinst/spotinst-sdk-go v1.86.0/go.mod h1:RuKksd1/RyQogMCxKFI5B75NeFRcgl3W+26DVX6S4m0=
github.com/spotinst/spotinst-sdk-go v1.89.0 h1:VRgnhUwrI2XwzZLHQyzLguGS4z5Ok5wgy4Y9RVs+Rh8=
github.com/spotinst/spotinst-sdk-go v1.89.0/go.mod h1:RuKksd1/RyQogMCxKFI5B75NeFRcgl3W+26DVX6S4m0=
github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down
19 changes: 19 additions & 0 deletions sdk/dotnet/Aws/Elastigroup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@ public partial class Elastigroup : Pulumi.CustomResource
[Output("statefulDeallocation")]
public Output<Outputs.ElastigroupStatefulDeallocation?> StatefulDeallocation { get; private set; } = null!;

[Output("statefulInstanceActions")]
public Output<ImmutableArray<Outputs.ElastigroupStatefulInstanceAction>> StatefulInstanceActions { get; private set; } = null!;

/// <summary>
/// List of Strings of subnet identifiers.
/// Note: When this parameter is set, `availability_zones` should be left unused.
Expand Down Expand Up @@ -940,6 +943,14 @@ public InputList<Inputs.ElastigroupSignalArgs> Signals
[Input("statefulDeallocation")]
public Input<Inputs.ElastigroupStatefulDeallocationArgs>? StatefulDeallocation { get; set; }

[Input("statefulInstanceActions")]
private InputList<Inputs.ElastigroupStatefulInstanceActionArgs>? _statefulInstanceActions;
public InputList<Inputs.ElastigroupStatefulInstanceActionArgs> StatefulInstanceActions
{
get => _statefulInstanceActions ?? (_statefulInstanceActions = new InputList<Inputs.ElastigroupStatefulInstanceActionArgs>());
set => _statefulInstanceActions = value;
}

[Input("subnetIds")]
private InputList<string>? _subnetIds;

Expand Down Expand Up @@ -1482,6 +1493,14 @@ public InputList<Inputs.ElastigroupSignalGetArgs> Signals
[Input("statefulDeallocation")]
public Input<Inputs.ElastigroupStatefulDeallocationGetArgs>? StatefulDeallocation { get; set; }

[Input("statefulInstanceActions")]
private InputList<Inputs.ElastigroupStatefulInstanceActionGetArgs>? _statefulInstanceActions;
public InputList<Inputs.ElastigroupStatefulInstanceActionGetArgs> StatefulInstanceActions
{
get => _statefulInstanceActions ?? (_statefulInstanceActions = new InputList<Inputs.ElastigroupStatefulInstanceActionGetArgs>());
set => _statefulInstanceActions = value;
}

[Input("subnetIds")]
private InputList<string>? _subnetIds;

Expand Down
31 changes: 31 additions & 0 deletions sdk/dotnet/Aws/Inputs/ElastigroupStatefulInstanceActionArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.SpotInst.Aws.Inputs
{

public sealed class ElastigroupStatefulInstanceActionArgs : Pulumi.ResourceArgs
{
/// <summary>
/// String, Stateful Instance ID on which the action should be performed.
/// </summary>
[Input("statefulInstanceId", required: true)]
public Input<string> StatefulInstanceId { get; set; } = null!;

/// <summary>
/// String, Action type. Supported action types: `pause`, `resume`, `recycle`, `deallocate`.
/// </summary>
[Input("type", required: true)]
public Input<string> Type { get; set; } = null!;

public ElastigroupStatefulInstanceActionArgs()
{
}
}
}
31 changes: 31 additions & 0 deletions sdk/dotnet/Aws/Inputs/ElastigroupStatefulInstanceActionGetArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.SpotInst.Aws.Inputs
{

public sealed class ElastigroupStatefulInstanceActionGetArgs : Pulumi.ResourceArgs
{
/// <summary>
/// String, Stateful Instance ID on which the action should be performed.
/// </summary>
[Input("statefulInstanceId", required: true)]
public Input<string> StatefulInstanceId { get; set; } = null!;

/// <summary>
/// String, Action type. Supported action types: `pause`, `resume`, `recycle`, `deallocate`.
/// </summary>
[Input("type", required: true)]
public Input<string> Type { get; set; } = null!;

public ElastigroupStatefulInstanceActionGetArgs()
{
}
}
}
25 changes: 25 additions & 0 deletions sdk/dotnet/Aws/Inputs/OceanLaunchSpecCreateOptionsArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.SpotInst.Aws.Inputs
{

public sealed class OceanLaunchSpecCreateOptionsArgs : Pulumi.ResourceArgs
{
/// <summary>
/// When set to an integer greater than 0, a corresponding amount of nodes will be launched from the created virtual node group.
/// </summary>
[Input("initialNodes", required: true)]
public Input<int> InitialNodes { get; set; } = null!;

public OceanLaunchSpecCreateOptionsArgs()
{
}
}
}
25 changes: 25 additions & 0 deletions sdk/dotnet/Aws/Inputs/OceanLaunchSpecCreateOptionsGetArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.SpotInst.Aws.Inputs
{

public sealed class OceanLaunchSpecCreateOptionsGetArgs : Pulumi.ResourceArgs
{
/// <summary>
/// When set to an integer greater than 0, a corresponding amount of nodes will be launched from the created virtual node group.
/// </summary>
[Input("initialNodes", required: true)]
public Input<int> InitialNodes { get; set; } = null!;

public OceanLaunchSpecCreateOptionsGetArgs()
{
}
}
}
9 changes: 9 additions & 0 deletions sdk/dotnet/Aws/ManagedInstance.cs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ public partial class ManagedInstance : Pulumi.CustomResource
[Output("loadBalancers")]
public Output<ImmutableArray<Outputs.ManagedInstanceLoadBalancer>> LoadBalancers { get; private set; } = null!;

[Output("minimumInstanceLifetime")]
public Output<int?> MinimumInstanceLifetime { get; private set; } = null!;

/// <summary>
/// The record set name.
/// </summary>
Expand Down Expand Up @@ -434,6 +437,9 @@ public InputList<Inputs.ManagedInstanceLoadBalancerArgs> LoadBalancers
set => _loadBalancers = value;
}

[Input("minimumInstanceLifetime")]
public Input<int>? MinimumInstanceLifetime { get; set; }

/// <summary>
/// The record set name.
/// </summary>
Expand Down Expand Up @@ -732,6 +738,9 @@ public InputList<Inputs.ManagedInstanceLoadBalancerGetArgs> LoadBalancers
set => _loadBalancers = value;
}

[Input("minimumInstanceLifetime")]
public Input<int>? MinimumInstanceLifetime { get; set; }

/// <summary>
/// The record set name.
/// </summary>
Expand Down
13 changes: 13 additions & 0 deletions sdk/dotnet/Aws/OceanLaunchSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ namespace Pulumi.SpotInst.Aws
/// },
/// },
/// },
/// CreateOptions = new SpotInst.Aws.Inputs.OceanLaunchSpecCreateOptionsArgs
/// {
/// InitialNodes = 1,
/// },
/// ElasticIpPools =
/// {
/// new SpotInst.Aws.Inputs.OceanLaunchSpecElasticIpPoolArgs
Expand Down Expand Up @@ -168,6 +172,9 @@ public partial class OceanLaunchSpec : Pulumi.CustomResource
[Output("blockDeviceMappings")]
public Output<ImmutableArray<Outputs.OceanLaunchSpecBlockDeviceMapping>> BlockDeviceMappings { get; private set; } = null!;

[Output("createOptions")]
public Output<Outputs.OceanLaunchSpecCreateOptions?> CreateOptions { get; private set; } = null!;

/// <summary>
/// Assign an Elastic IP to the instances spun by the Virtual Node Group. Can be null.
/// </summary>
Expand Down Expand Up @@ -334,6 +341,9 @@ public InputList<Inputs.OceanLaunchSpecBlockDeviceMappingArgs> BlockDeviceMappin
set => _blockDeviceMappings = value;
}

[Input("createOptions")]
public Input<Inputs.OceanLaunchSpecCreateOptionsArgs>? CreateOptions { get; set; }

[Input("elasticIpPools")]
private InputList<Inputs.OceanLaunchSpecElasticIpPoolArgs>? _elasticIpPools;

Expand Down Expand Up @@ -513,6 +523,9 @@ public InputList<Inputs.OceanLaunchSpecBlockDeviceMappingGetArgs> BlockDeviceMap
set => _blockDeviceMappings = value;
}

[Input("createOptions")]
public Input<Inputs.OceanLaunchSpecCreateOptionsGetArgs>? CreateOptions { get; set; }

[Input("elasticIpPools")]
private InputList<Inputs.OceanLaunchSpecElasticIpPoolGetArgs>? _elasticIpPools;

Expand Down
35 changes: 35 additions & 0 deletions sdk/dotnet/Aws/Outputs/ElastigroupStatefulInstanceAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.SpotInst.Aws.Outputs
{

[OutputType]
public sealed class ElastigroupStatefulInstanceAction
{
/// <summary>
/// String, Stateful Instance ID on which the action should be performed.
/// </summary>
public readonly string StatefulInstanceId;
/// <summary>
/// String, Action type. Supported action types: `pause`, `resume`, `recycle`, `deallocate`.
/// </summary>
public readonly string Type;

[OutputConstructor]
private ElastigroupStatefulInstanceAction(
string statefulInstanceId,

string type)
{
StatefulInstanceId = statefulInstanceId;
Type = type;
}
}
}
27 changes: 27 additions & 0 deletions sdk/dotnet/Aws/Outputs/OceanLaunchSpecCreateOptions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.SpotInst.Aws.Outputs
{

[OutputType]
public sealed class OceanLaunchSpecCreateOptions
{
/// <summary>
/// When set to an integer greater than 0, a corresponding amount of nodes will be launched from the created virtual node group.
/// </summary>
public readonly int InitialNodes;

[OutputConstructor]
private OceanLaunchSpecCreateOptions(int initialNodes)
{
InitialNodes = initialNodes;
}
}
}
25 changes: 25 additions & 0 deletions sdk/dotnet/Gke/Inputs/OceanLaunchSpecStrategyArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.SpotInst.Gke.Inputs
{

public sealed class OceanLaunchSpecStrategyArgs : Pulumi.ResourceArgs
{
/// <summary>
/// Defines the desired preemptible percentage for this launch specification.
/// </summary>
[Input("preemptiblePercentage")]
public Input<int>? PreemptiblePercentage { get; set; }

public OceanLaunchSpecStrategyArgs()
{
}
}
}
Loading

0 comments on commit f637a6f

Please sign in to comment.