Skip to content

Commit

Permalink
Merge pull request #145 from pulumi/stack72/v1.60.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 authored Oct 4, 2021
2 parents 5c413fa + 9eca6c4 commit e6a7a7e
Show file tree
Hide file tree
Showing 32 changed files with 370 additions and 10 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.60.0 of the SpotInst Terraform Provider

---

Expand Down
42 changes: 41 additions & 1 deletion 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.20210921173948-db02c3f46a67
github.com/spotinst/terraform-provider-spotinst => github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210930183605-792972b16aac
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
)
6 changes: 6 additions & 0 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,8 @@ github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210901132348-c81e6d649
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210901132348-c81e6d649e2f/go.mod h1:oncSnoavwuhKmo+XsKN/Mpwz2bFc0+MgXhb4YL4KGuM=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210921173948-db02c3f46a67 h1:1qlZnMMNhnNYj3pL/58C+fFMV7McNfO9iZ9K96m92Pg=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210921173948-db02c3f46a67/go.mod h1:TTjFD/Fg2SYG6G/P1jsJruErTGaFbS+SHQsoSljccdY=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210930183605-792972b16aac h1:3We4rzmGawDx+NtPU7XzwrCVmlbBQ0eHj8rpX5UgReY=
github.com/pulumi/terraform-provider-spotinst v1.33.1-0.20210930183605-792972b16aac/go.mod h1:pPcXjnYsIEzUqOyoTDoUNFYPDn/ue0Ytt3tErNNX95Q=
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 @@ -927,6 +929,8 @@ github.com/spotinst/spotinst-sdk-go v1.99.0 h1:px6KxKJJwiX/rMZDD6PIe82i+x3umwUkk
github.com/spotinst/spotinst-sdk-go v1.99.0/go.mod h1:RuKksd1/RyQogMCxKFI5B75NeFRcgl3W+26DVX6S4m0=
github.com/spotinst/spotinst-sdk-go v1.101.0 h1:tM0P51ubc7ze2cNe56eR3crPZHZYkXA8P8CCBP5/qzo=
github.com/spotinst/spotinst-sdk-go v1.101.0/go.mod h1:Qkmfd9bPSLEUyBa50KBA2KJITTkWNN2UqteYTYSGCls=
github.com/spotinst/spotinst-sdk-go v1.102.0 h1:BCFPUwrLQufZ+cI2mWlDkuC4EJyPXDD7QoxjoF8S/04=
github.com/spotinst/spotinst-sdk-go v1.102.0/go.mod h1:yaIEiSvAzil0DXpwb4rJ02o5gvDU/06u5Hxv3CJHX+M=
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 Expand Up @@ -1353,6 +1357,8 @@ gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.63.0 h1:2t0h8NA59dpVQpa5Yh8cIcR6nHAeBIEk0zlLVqfw4N4=
gopkg.in/ini.v1 v1.63.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.63.2 h1:tGK/CyBg7SMzb60vP1M03vNZ3VDu3wGQJwn7Sxi9r3c=
gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Aws/Inputs/OceanLaunchSpecResourceLimitArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ public sealed class OceanLaunchSpecResourceLimitArgs : Pulumi.ResourceArgs
[Input("maxInstanceCount")]
public Input<int>? MaxInstanceCount { get; set; }

/// <summary>
/// Set a minimum number of instances per Virtual Node Group. Can be null. If set, value must be greater than or equal to 0.
/// </summary>
[Input("minInstanceCount")]
public Input<int>? MinInstanceCount { get; set; }

public OceanLaunchSpecResourceLimitArgs()
{
}
Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Aws/Inputs/OceanLaunchSpecResourceLimitGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ public sealed class OceanLaunchSpecResourceLimitGetArgs : Pulumi.ResourceArgs
[Input("maxInstanceCount")]
public Input<int>? MaxInstanceCount { get; set; }

/// <summary>
/// Set a minimum number of instances per Virtual Node Group. Can be null. If set, value must be greater than or equal to 0.
/// </summary>
[Input("minInstanceCount")]
public Input<int>? MinInstanceCount { get; set; }

public OceanLaunchSpecResourceLimitGetArgs()
{
}
Expand Down
1 change: 1 addition & 0 deletions sdk/dotnet/Aws/OceanLaunchSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ namespace Pulumi.SpotInst.Aws
/// new SpotInst.Aws.Inputs.OceanLaunchSpecResourceLimitArgs
/// {
/// MaxInstanceCount = 4,
/// MinInstanceCount = 0,
/// },
/// },
/// RestrictScaleDown = true,
Expand Down
10 changes: 9 additions & 1 deletion sdk/dotnet/Aws/Outputs/OceanLaunchSpecResourceLimit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,19 @@ public sealed class OceanLaunchSpecResourceLimit
/// Set a maximum number of instances per Virtual Node Group. Can be null. If set, value must be greater than or equal to 0.
/// </summary>
public readonly int? MaxInstanceCount;
/// <summary>
/// Set a minimum number of instances per Virtual Node Group. Can be null. If set, value must be greater than or equal to 0.
/// </summary>
public readonly int? MinInstanceCount;

[OutputConstructor]
private OceanLaunchSpecResourceLimit(int? maxInstanceCount)
private OceanLaunchSpecResourceLimit(
int? maxInstanceCount,

int? minInstanceCount)
{
MaxInstanceCount = maxInstanceCount;
MinInstanceCount = minInstanceCount;
}
}
}
6 changes: 6 additions & 0 deletions sdk/dotnet/Ecs/Inputs/OceanAutoscalerArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ namespace Pulumi.SpotInst.Ecs.Inputs

public sealed class OceanAutoscalerArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The auto-headroom percentage. Set a number between 0-200 to control the headroom % of the cluster. Relevant when `isAutoConfig`= true.
/// </summary>
[Input("autoHeadroomPercentage")]
public Input<int>? AutoHeadroomPercentage { get; set; }

/// <summary>
/// Cooldown period between scaling actions.
/// </summary>
Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Ecs/Inputs/OceanAutoscalerGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ namespace Pulumi.SpotInst.Ecs.Inputs

public sealed class OceanAutoscalerGetArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The auto-headroom percentage. Set a number between 0-200 to control the headroom % of the cluster. Relevant when `isAutoConfig`= true.
/// </summary>
[Input("autoHeadroomPercentage")]
public Input<int>? AutoHeadroomPercentage { get; set; }

/// <summary>
/// Cooldown period between scaling actions.
/// </summary>
Expand Down
7 changes: 7 additions & 0 deletions sdk/dotnet/Ecs/Outputs/OceanAutoscaler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ namespace Pulumi.SpotInst.Ecs.Outputs
[OutputType]
public sealed class OceanAutoscaler
{
/// <summary>
/// The auto-headroom percentage. Set a number between 0-200 to control the headroom % of the cluster. Relevant when `isAutoConfig`= true.
/// </summary>
public readonly int? AutoHeadroomPercentage;
/// <summary>
/// Cooldown period between scaling actions.
/// </summary>
Expand Down Expand Up @@ -40,6 +44,8 @@ public sealed class OceanAutoscaler

[OutputConstructor]
private OceanAutoscaler(
int? autoHeadroomPercentage,

int? cooldown,

Outputs.OceanAutoscalerDown? down,
Expand All @@ -52,6 +58,7 @@ private OceanAutoscaler(

Outputs.OceanAutoscalerResourceLimits? resourceLimits)
{
AutoHeadroomPercentage = autoHeadroomPercentage;
Cooldown = cooldown;
Down = down;
Headroom = headroom;
Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Gke/Inputs/OceanLaunchSpecResourceLimitsArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ public sealed class OceanLaunchSpecResourceLimitsArgs : Pulumi.ResourceArgs
[Input("maxInstanceCount")]
public Input<int>? MaxInstanceCount { get; set; }

/// <summary>
/// Option to set a minimum number of instances per virtual node group. Can be null. If set, the value must be greater than or equal to 0.
/// </summary>
[Input("minInstanceCount")]
public Input<int>? MinInstanceCount { get; set; }

public OceanLaunchSpecResourceLimitsArgs()
{
}
Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Gke/Inputs/OceanLaunchSpecResourceLimitsGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ public sealed class OceanLaunchSpecResourceLimitsGetArgs : Pulumi.ResourceArgs
[Input("maxInstanceCount")]
public Input<int>? MaxInstanceCount { get; set; }

/// <summary>
/// Option to set a minimum number of instances per virtual node group. Can be null. If set, the value must be greater than or equal to 0.
/// </summary>
[Input("minInstanceCount")]
public Input<int>? MinInstanceCount { get; set; }

public OceanLaunchSpecResourceLimitsGetArgs()
{
}
Expand Down
18 changes: 18 additions & 0 deletions sdk/dotnet/Gke/OceanLaunchSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ public partial class OceanLaunchSpec : Pulumi.CustomResource
[Output("metadatas")]
public Output<ImmutableArray<Outputs.OceanLaunchSpecMetadata>> Metadatas { get; private set; } = null!;

/// <summary>
/// The launch specification name.
/// </summary>
[Output("name")]
public Output<string> Name { get; private set; } = null!;

/// <summary>
/// The node pool you wish to use in your Launch Spec.
/// </summary>
Expand Down Expand Up @@ -207,6 +213,12 @@ public InputList<Inputs.OceanLaunchSpecMetadataArgs> Metadatas
set => _metadatas = value;
}

/// <summary>
/// The launch specification name.
/// </summary>
[Input("name")]
public Input<string>? Name { get; set; }

/// <summary>
/// The node pool you wish to use in your Launch Spec.
/// </summary>
Expand Down Expand Up @@ -346,6 +358,12 @@ public InputList<Inputs.OceanLaunchSpecMetadataGetArgs> Metadatas
set => _metadatas = value;
}

/// <summary>
/// The launch specification name.
/// </summary>
[Input("name")]
public Input<string>? Name { get; set; }

/// <summary>
/// The node pool you wish to use in your Launch Spec.
/// </summary>
Expand Down
10 changes: 9 additions & 1 deletion sdk/dotnet/Gke/Outputs/OceanLaunchSpecResourceLimits.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,19 @@ public sealed class OceanLaunchSpecResourceLimits
/// Option to set a maximum number of instances per virtual node group. Can be null. If set, the value must be greater than or equal to 0.
/// </summary>
public readonly int? MaxInstanceCount;
/// <summary>
/// Option to set a minimum number of instances per virtual node group. Can be null. If set, the value must be greater than or equal to 0.
/// </summary>
public readonly int? MinInstanceCount;

[OutputConstructor]
private OceanLaunchSpecResourceLimits(int? maxInstanceCount)
private OceanLaunchSpecResourceLimits(
int? maxInstanceCount,

int? minInstanceCount)
{
MaxInstanceCount = maxInstanceCount;
MinInstanceCount = minInstanceCount;
}
}
}
1 change: 1 addition & 0 deletions sdk/go/spotinst/aws/oceanLaunchSpec.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ import (
// ResourceLimits: aws.OceanLaunchSpecResourceLimitArray{
// &aws.OceanLaunchSpecResourceLimitArgs{
// MaxInstanceCount: pulumi.Int(4),
// MinInstanceCount: pulumi.Int(0),
// },
// },
// RestrictScaleDown: pulumi.Bool(true),
Expand Down
9 changes: 9 additions & 0 deletions sdk/go/spotinst/aws/pulumiTypes.go
Original file line number Diff line number Diff line change
Expand Up @@ -17690,6 +17690,8 @@ func (o OceanLaunchSpecLabelArrayOutput) Index(i pulumi.IntInput) OceanLaunchSpe
type OceanLaunchSpecResourceLimit struct {
// Set a maximum number of instances per Virtual Node Group. Can be null. If set, value must be greater than or equal to 0.
MaxInstanceCount *int `pulumi:"maxInstanceCount"`
// Set a minimum number of instances per Virtual Node Group. Can be null. If set, value must be greater than or equal to 0.
MinInstanceCount *int `pulumi:"minInstanceCount"`
}

// OceanLaunchSpecResourceLimitInput is an input type that accepts OceanLaunchSpecResourceLimitArgs and OceanLaunchSpecResourceLimitOutput values.
Expand All @@ -17706,6 +17708,8 @@ type OceanLaunchSpecResourceLimitInput interface {
type OceanLaunchSpecResourceLimitArgs struct {
// Set a maximum number of instances per Virtual Node Group. Can be null. If set, value must be greater than or equal to 0.
MaxInstanceCount pulumi.IntPtrInput `pulumi:"maxInstanceCount"`
// Set a minimum number of instances per Virtual Node Group. Can be null. If set, value must be greater than or equal to 0.
MinInstanceCount pulumi.IntPtrInput `pulumi:"minInstanceCount"`
}

func (OceanLaunchSpecResourceLimitArgs) ElementType() reflect.Type {
Expand Down Expand Up @@ -17764,6 +17768,11 @@ func (o OceanLaunchSpecResourceLimitOutput) MaxInstanceCount() pulumi.IntPtrOutp
return o.ApplyT(func(v OceanLaunchSpecResourceLimit) *int { return v.MaxInstanceCount }).(pulumi.IntPtrOutput)
}

// Set a minimum number of instances per Virtual Node Group. Can be null. If set, value must be greater than or equal to 0.
func (o OceanLaunchSpecResourceLimitOutput) MinInstanceCount() pulumi.IntPtrOutput {
return o.ApplyT(func(v OceanLaunchSpecResourceLimit) *int { return v.MinInstanceCount }).(pulumi.IntPtrOutput)
}

type OceanLaunchSpecResourceLimitArrayOutput struct{ *pulumi.OutputState }

func (OceanLaunchSpecResourceLimitArrayOutput) ElementType() reflect.Type {
Expand Down
19 changes: 19 additions & 0 deletions sdk/go/spotinst/ecs/pulumiTypes.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
)

type OceanAutoscaler struct {
// The auto-headroom percentage. Set a number between 0-200 to control the headroom % of the cluster. Relevant when `isAutoConfig`= true.
AutoHeadroomPercentage *int `pulumi:"autoHeadroomPercentage"`
// Cooldown period between scaling actions.
Cooldown *int `pulumi:"cooldown"`
// Auto Scaling scale down operations.
Expand All @@ -37,6 +39,8 @@ type OceanAutoscalerInput interface {
}

type OceanAutoscalerArgs struct {
// The auto-headroom percentage. Set a number between 0-200 to control the headroom % of the cluster. Relevant when `isAutoConfig`= true.
AutoHeadroomPercentage pulumi.IntPtrInput `pulumi:"autoHeadroomPercentage"`
// Cooldown period between scaling actions.
Cooldown pulumi.IntPtrInput `pulumi:"cooldown"`
// Auto Scaling scale down operations.
Expand Down Expand Up @@ -128,6 +132,11 @@ func (o OceanAutoscalerOutput) ToOceanAutoscalerPtrOutputWithContext(ctx context
}).(OceanAutoscalerPtrOutput)
}

// The auto-headroom percentage. Set a number between 0-200 to control the headroom % of the cluster. Relevant when `isAutoConfig`= true.
func (o OceanAutoscalerOutput) AutoHeadroomPercentage() pulumi.IntPtrOutput {
return o.ApplyT(func(v OceanAutoscaler) *int { return v.AutoHeadroomPercentage }).(pulumi.IntPtrOutput)
}

// Cooldown period between scaling actions.
func (o OceanAutoscalerOutput) Cooldown() pulumi.IntPtrOutput {
return o.ApplyT(func(v OceanAutoscaler) *int { return v.Cooldown }).(pulumi.IntPtrOutput)
Expand Down Expand Up @@ -176,6 +185,16 @@ func (o OceanAutoscalerPtrOutput) Elem() OceanAutoscalerOutput {
return o.ApplyT(func(v *OceanAutoscaler) OceanAutoscaler { return *v }).(OceanAutoscalerOutput)
}

// The auto-headroom percentage. Set a number between 0-200 to control the headroom % of the cluster. Relevant when `isAutoConfig`= true.
func (o OceanAutoscalerPtrOutput) AutoHeadroomPercentage() pulumi.IntPtrOutput {
return o.ApplyT(func(v *OceanAutoscaler) *int {
if v == nil {
return nil
}
return v.AutoHeadroomPercentage
}).(pulumi.IntPtrOutput)
}

// Cooldown period between scaling actions.
func (o OceanAutoscalerPtrOutput) Cooldown() pulumi.IntPtrOutput {
return o.ApplyT(func(v *OceanAutoscaler) *int {
Expand Down
10 changes: 10 additions & 0 deletions sdk/go/spotinst/gke/oceanLaunchSpec.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type OceanLaunchSpec struct {
Labels OceanLaunchSpecLabelArrayOutput `pulumi:"labels"`
// Cluster's metadata.
Metadatas OceanLaunchSpecMetadataArrayOutput `pulumi:"metadatas"`
// The launch specification name.
Name pulumi.StringOutput `pulumi:"name"`
// The node pool you wish to use in your Launch Spec.
NodePoolName pulumi.StringPtrOutput `pulumi:"nodePoolName"`
// The Ocean cluster ID.
Expand Down Expand Up @@ -91,6 +93,8 @@ type oceanLaunchSpecState struct {
Labels []OceanLaunchSpecLabel `pulumi:"labels"`
// Cluster's metadata.
Metadatas []OceanLaunchSpecMetadata `pulumi:"metadatas"`
// The launch specification name.
Name *string `pulumi:"name"`
// The node pool you wish to use in your Launch Spec.
NodePoolName *string `pulumi:"nodePoolName"`
// The Ocean cluster ID.
Expand Down Expand Up @@ -126,6 +130,8 @@ type OceanLaunchSpecState struct {
Labels OceanLaunchSpecLabelArrayInput
// Cluster's metadata.
Metadatas OceanLaunchSpecMetadataArrayInput
// The launch specification name.
Name pulumi.StringPtrInput
// The node pool you wish to use in your Launch Spec.
NodePoolName pulumi.StringPtrInput
// The Ocean cluster ID.
Expand Down Expand Up @@ -165,6 +171,8 @@ type oceanLaunchSpecArgs struct {
Labels []OceanLaunchSpecLabel `pulumi:"labels"`
// Cluster's metadata.
Metadatas []OceanLaunchSpecMetadata `pulumi:"metadatas"`
// The launch specification name.
Name *string `pulumi:"name"`
// The node pool you wish to use in your Launch Spec.
NodePoolName *string `pulumi:"nodePoolName"`
// The Ocean cluster ID.
Expand Down Expand Up @@ -201,6 +209,8 @@ type OceanLaunchSpecArgs struct {
Labels OceanLaunchSpecLabelArrayInput
// Cluster's metadata.
Metadatas OceanLaunchSpecMetadataArrayInput
// The launch specification name.
Name pulumi.StringPtrInput
// The node pool you wish to use in your Launch Spec.
NodePoolName pulumi.StringPtrInput
// The Ocean cluster ID.
Expand Down
Loading

0 comments on commit e6a7a7e

Please sign in to comment.