Skip to content

Commit

Permalink
Merge pull request #56 from pulumi/bridge-v2.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@stack72
stack72 authored Aug 31, 2020
2 parents ac23457 + f6c3be7 commit a9d762f
Show file tree
Hide file tree
Showing 26 changed files with 442 additions and 436 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CHANGELOG
=========

## HEAD (Unreleased)
* Upgrade to pulumi-terraform-bridge v2.7.0
* Upgrade to pulumi-terraform-bridge v2.7.3
* Upgrade to Pulumi v2.9.0, which adds type annotations and input/output classes to Python
* Upgrade to v1.25.0 of the SpotInst Terraform Provider

Expand Down Expand Up @@ -39,7 +39,7 @@ CHANGELOG
* Upgrade to v1.16.0 of the SpotInst Terraform Provider

## 2.2.0 (2020-05-12)
* Upgrade to v1.15.0 of the SpotInst Terraform Provider
* Upgrade to v1.15.0 of the SpotInst Terraform Provider
* Upgrade to pulumi-terraform-bridge v2.3.1

## 2.1.0 (2020-04-28)
Expand All @@ -56,7 +56,7 @@ CHANGELOG
* Upgrade to v1.14.3 of the SpotInst Terraform Provider

## 1.2.0 (2020-03-21)
* Upgrade to Pulumi v1.12.1
* Upgrade to Pulumi v1.12.1
* Upgrade to v1.8.2 of pulumi-terraform-bridge

## 1.1.1 (2020-01-31)
Expand Down
4 changes: 2 additions & 2 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.14

require (
github.com/hashicorp/terraform-plugin-sdk v1.12.0
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.3
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200825190708-910aa96016cd
github.com/terraform-providers/terraform-provider-spotinst v1.25.0
)

Expand Down
6 changes: 6 additions & 0 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,8 @@ github.com/pulumi/pulumi-terraform-bridge/v2 v2.6.0 h1:VSg0nVCf/IdslwOlHmoVQcAmI
github.com/pulumi/pulumi-terraform-bridge/v2 v2.6.0/go.mod h1:+OsFzDf6+9dY73x6icyXR8NasSnTXx7F1x/B6LBAlZI=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2 h1:ZgBUEz1zPN1p8el+YDXoRlOPSPcBz8ytfZH6Ncj/PN4=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2/go.mod h1:UvbLRW8+YFluKwRZjzP3coPYWQPPYh/q9e2NN2GPbxg=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.3 h1:XZxl0fsf9vO45FM+tKPYE9f30fM+q2s6lHsEzkdnBNs=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.3/go.mod h1:TW+CNCZHzlH42y0vmRA9gOzeTFh3Cp7MN9DoGcRDLvo=
github.com/pulumi/pulumi/pkg/v2 v2.0.0/go.mod h1:kNG9MBTdKP9AzMgkETumR3fmX9gUYB+HpQL767K6jXc=
github.com/pulumi/pulumi/pkg/v2 v2.2.2-0.20200519081838-f66100ce28b0/go.mod h1:GV88eCIrqfFcBWd5QUdN3qMsR0h+x+iRIBnBhhvB78A=
github.com/pulumi/pulumi/pkg/v2 v2.3.1-0.20200607162109-9754465b04db h1:5HrO1GNA53QEp+yN1UCX7BUsJD2I5/k1u2KLO4hOxOA=
Expand All @@ -523,6 +525,8 @@ github.com/pulumi/pulumi/pkg/v2 v2.6.2-0.20200715231137-1a10e06588f6 h1:3AvdiZZW
github.com/pulumi/pulumi/pkg/v2 v2.6.2-0.20200715231137-1a10e06588f6/go.mod h1:zfUm4/GH2dVRlHZ3Yeb9bRweCQM7icVBdplu6MUDRrQ=
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200821035132-629254334213 h1:c8UQ842Zg6XzX4sPeGhBo8hiGFzoU23vaMmxk64V8eU=
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200821035132-629254334213/go.mod h1:Yq1q3nwy/KeU08DyyX0QsMyc6SqPs0jGJb8ev5f45AU=
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200825190708-910aa96016cd h1:e4nK2jqLm6g7qMW0BInHR3ZM55y1NblvgOlkfNGT2F4=
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200825190708-910aa96016cd/go.mod h1:Yq1q3nwy/KeU08DyyX0QsMyc6SqPs0jGJb8ev5f45AU=
github.com/pulumi/pulumi/sdk/v2 v2.0.0 h1:3VMXbEo3bqeaU+YDt8ufVBLD0WhLYE3tG3t/nIZ3Iac=
github.com/pulumi/pulumi/sdk/v2 v2.0.0/go.mod h1:W7k1UDYerc5o97mHnlHHp5iQZKEby+oQrQefWt+2RF4=
github.com/pulumi/pulumi/sdk/v2 v2.2.2-0.20200519081838-f66100ce28b0/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
Expand All @@ -537,6 +541,8 @@ github.com/pulumi/pulumi/sdk/v2 v2.7.1 h1:nv/bgZ4Q55Pvv2OVqAJ8wSKL4Fo8/oqK4WrKjZ
github.com/pulumi/pulumi/sdk/v2 v2.7.1/go.mod h1:uZynzlmQbvvoNLuB7H7RQV9l4+eEpKI+J1UI1qqeuUM=
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213 h1:h4hBtS6/S0a1deLtJuUuYAIZGOCIJY9OVSdmC4VRk+M=
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213/go.mod h1:x84WPiFiuE+G4kJ5jUYkOxmnQJlWoJaHNeEYdqnCKA4=
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200825190708-910aa96016cd h1:m5jEWpbr/Q94vCqA/7fw5US7cHZLeQiMQXrnSblZzdU=
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200825190708-910aa96016cd/go.mod h1:x84WPiFiuE+G4kJ5jUYkOxmnQJlWoJaHNeEYdqnCKA4=
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d h1:1JtzB9Gx0YX2UgKKkqJwTgBXxfg2cbLUEqTJKwKBK7s=
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d/go.mod h1:yv9XozKsue9ZELHQbrBGgIaFtE3OX3Q4m7koTzTqgpE=
github.com/pulumi/tf2pulumi v0.8.1-0.20200528170746-c1234defe2b5 h1:h+pUwgEser1Ole6TMCc66njRPcw7SEVXpeoClG+ihEM=
Expand Down
28 changes: 14 additions & 14 deletions sdk/python/pulumi_spotinst/aws/beanstalk.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

class Beanstalk(pulumi.CustomResource):
def __init__(__self__,
resource_name,
resource_name: str,
opts: Optional[pulumi.ResourceOptions] = None,
beanstalk_environment_id: Optional[pulumi.Input[str]] = None,
beanstalk_environment_name: Optional[pulumi.Input[str]] = None,
Expand Down Expand Up @@ -219,84 +219,84 @@ def get(resource_name: str,

@property
@pulumi.getter(name="beanstalkEnvironmentId")
def beanstalk_environment_id(self) -> Optional[str]:
def beanstalk_environment_id(self) -> pulumi.Output[Optional[str]]:
"""
The id of an existing Beanstalk environment.
"""
return pulumi.get(self, "beanstalk_environment_id")

@property
@pulumi.getter(name="beanstalkEnvironmentName")
def beanstalk_environment_name(self) -> Optional[str]:
def beanstalk_environment_name(self) -> pulumi.Output[Optional[str]]:
"""
The name of an existing Beanstalk environment.
"""
return pulumi.get(self, "beanstalk_environment_name")

@property
@pulumi.getter(name="deploymentPreferences")
def deployment_preferences(self) -> Optional['outputs.BeanstalkDeploymentPreferences']:
def deployment_preferences(self) -> pulumi.Output[Optional['outputs.BeanstalkDeploymentPreferences']]:
"""
Preferences when performing a roll
"""
return pulumi.get(self, "deployment_preferences")

@property
@pulumi.getter(name="desiredCapacity")
def desired_capacity(self) -> float:
def desired_capacity(self) -> pulumi.Output[float]:
"""
The desired number of instances the group should have at any time.
"""
return pulumi.get(self, "desired_capacity")

@property
@pulumi.getter(name="instanceTypesSpots")
def instance_types_spots(self) -> List[str]:
def instance_types_spots(self) -> pulumi.Output[List[str]]:
"""
One or more instance types. To maximize the availability of Spot instances, select as many instance types as possible.
"""
return pulumi.get(self, "instance_types_spots")

@property
@pulumi.getter
def maintenance(self) -> Optional[str]:
def maintenance(self) -> pulumi.Output[Optional[str]]:
return pulumi.get(self, "maintenance")

@property
@pulumi.getter(name="managedActions")
def managed_actions(self) -> Optional['outputs.BeanstalkManagedActions']:
def managed_actions(self) -> pulumi.Output[Optional['outputs.BeanstalkManagedActions']]:
"""
Managed Actions parameters
"""
return pulumi.get(self, "managed_actions")

@property
@pulumi.getter(name="maxSize")
def max_size(self) -> float:
def max_size(self) -> pulumi.Output[float]:
"""
The maximum number of instances the group should have at any time.
"""
return pulumi.get(self, "max_size")

@property
@pulumi.getter(name="minSize")
def min_size(self) -> float:
def min_size(self) -> pulumi.Output[float]:
"""
The minimum number of instances the group should have at any time.
"""
return pulumi.get(self, "min_size")

@property
@pulumi.getter
def name(self) -> str:
def name(self) -> pulumi.Output[str]:
"""
The group name.
"""
return pulumi.get(self, "name")

@property
@pulumi.getter
def product(self) -> str:
def product(self) -> pulumi.Output[str]:
"""
Operation system type. Valid values: `"Linux/UNIX"`, `"SUSE Linux"`, `"Windows"`.
For EC2 Classic instances: `"Linux/UNIX (Amazon VPC)"`, `"SUSE Linux (Amazon VPC)"`, `"Windows (Amazon VPC)"`.
Expand All @@ -305,15 +305,15 @@ def product(self) -> str:

@property
@pulumi.getter
def region(self) -> str:
def region(self) -> pulumi.Output[str]:
"""
The AWS region your group will be created in. Cannot be changed after the group has been created.
"""
return pulumi.get(self, "region")

@property
@pulumi.getter(name="scheduledTasks")
def scheduled_tasks(self) -> Optional[List['outputs.BeanstalkScheduledTask']]:
def scheduled_tasks(self) -> pulumi.Output[Optional[List['outputs.BeanstalkScheduledTask']]]:
return pulumi.get(self, "scheduled_tasks")

def translate_output_property(self, prop):
Expand Down
Loading

0 comments on commit a9d762f

Please sign in to comment.