Skip to content

Commit

Permalink
Upgrade to @pulumi/pulumi@v3 and @pulumi/aws@v4 (#665)
Browse files Browse the repository at this point in the history
  • Loading branch information
@stack72
stack72 authored Apr 19, 2021
1 parent 333b1ff commit 6f2176d
Show file tree
Hide file tree
Showing 26 changed files with 587 additions and 61 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ CHANGELOG
=========

## HEAD (Unreleased)
_(none)_

## 0.30.0 (2021-04-19)

* Upgrade to @pulumi/pulumi@3.0.0 and @pulumi/aws@4.0.0
* Add additional StorageTypes to `awsx.s3.metrics`
* Add missing `HEAD` value to `awsx.apigateway.Method`

## 0.26 (2021-03-25)
## 0.26.0 (2021-03-25)

* Create `CapacityProviderService` to make it possible to use capacity provider strategies solving [#599](https://github.com/pulumi/pulumi-awsx/issues/599).
* Ensure that `awsx.apigateway.APIArgs` `RestApiArgs` reflect the underlying pulumi-aws library
Expand Down
10 changes: 4 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ module github.com/pulumi/pulumi-awsx

go 1.16

replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible

require (
github.com/aws/aws-sdk-go v1.29.27
github.com/aws/aws-sdk-go v1.37.31
github.com/docker/docker v1.13.1 // indirect
github.com/pulumi/pulumi/pkg/v2 v2.0.0
github.com/pulumi/pulumi/sdk/v2 v2.0.0
github.com/stretchr/testify v1.5.1
github.com/pulumi/pulumi/pkg/v3 v3.0.0
github.com/pulumi/pulumi/sdk/v3 v3.0.0
github.com/stretchr/testify v1.6.1
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
)
526 changes: 526 additions & 0 deletions go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion nodejs/awsx/aws_cognito_helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/aws/aws-sdk-go/aws/session"
cognito "github.com/aws/aws-sdk-go/service/cognitoidentityprovider"
"github.com/pulumi/pulumi/pkg/v2/testing/integration"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
)

func getCognitoUserToken(t *testing.T, stack integration.RuntimeValidationStackInfo) string {
Expand Down
14 changes: 7 additions & 7 deletions nodejs/awsx/aws_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import (

"github.com/stretchr/testify/assert"

"github.com/pulumi/pulumi/pkg/v2/operations"
"github.com/pulumi/pulumi/pkg/v2/resource/stack"
"github.com/pulumi/pulumi/pkg/v2/testing/integration"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
"github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
)

func TestAccCluster(t *testing.T) {
Expand Down Expand Up @@ -429,7 +429,7 @@ func getLogs(t *testing.T, region string, stackInfo integration.RuntimeValidatio

var states []*resource.State
for _, res := range stackInfo.Deployment.Resources {
state, err := stack.DeserializeResource(res, config.NewPanicCrypter())
state, err := stack.DeserializeResource(res, config.NewPanicCrypter(), config.NewPanicCrypter())
if !assert.NoError(t, err) {
return nil
}
Expand Down
6 changes: 3 additions & 3 deletions nodejs/awsx/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"install-peers": "install-peers"
},
"dependencies": {
"@pulumi/docker": "^1.0.0 || ^2.0.0",
"@pulumi/docker": "^3.0.0",
"@types/aws-lambda": "^8.10.23",
"mime": "^2.0.0"
},
"peerDependencies": {
"@pulumi/aws": "^3.25.1",
"@pulumi/pulumi": "^1.9.1 || ^2.0.0"
"@pulumi/aws": "^4.0.0",
"@pulumi/pulumi": "^3.0.0"
},
"devDependencies": {
"@types/aws-sdk": "^2.7.0",
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/alb/ec2/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/alb/ec2Instance/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/alb/fargate/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/alb/fargateInlineListener/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/alb/lambdaTarget/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0"
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0"
},
"devDependencies": {
"@types/aws-sdk": "^2.7.0",
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/cluster/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^1.0.0",
"@pulumi/aws": "^1.0.0"
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0"
},
"devDependencies": {
"@types/node": "^8.0.0"
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/dashboards/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.2.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/ec2/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/ecr/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
7 changes: 3 additions & 4 deletions nodejs/examples/ecs/capacity-provider-service-ec2-custom-strategy/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/aws": "^3.25.1",
"@pulumi/awsx": "^0.24.0",
"@pulumi/pulumi": "^2.0.0",
"@pulumi/random": "^3.0.3"
"@pulumi/aws": "^4.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/random": "^4.0.0"
}
}
5 changes: 2 additions & 3 deletions nodejs/examples/ecs/capacity-provider-service-with-cluster-default-strategies/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.25.1",
"@pulumi/awsx": "^0.24.0"
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0"
}
}
4 changes: 2 additions & 2 deletions nodejs/examples/ecs/fargate-service-with-firelens/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0"
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0"
},
"peerDependencies": {
"@pulumi/awsx": "latest"
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/ecs/task-definitions-with-proxy-config/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0"
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0"
},
"peerDependencies": {
"@pulumi/awsx": "latest"
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/metrics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.2.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/nlb/fargate/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/nlb/fargateShort/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/nlb/fargateShortInlineListener/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/vpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down
4 changes: 2 additions & 2 deletions nodejs/examples/vpcIgnoreSubnetChanges/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "tsc"
},
"dependencies": {
"@pulumi/pulumi": "^2.0.0",
"@pulumi/aws": "^3.0.0",
"@pulumi/pulumi": "^3.0.0",
"@pulumi/aws": "^4.0.0",
"node-fetch": "^2.6.1",
"redis": "^2.8.0"
},
Expand Down

0 comments on commit 6f2176d

Please sign in to comment.