From e3273a827baaa736ffcee573a5c5a56a49eb763a Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Tue, 14 Nov 2023 12:12:43 +0100 Subject: [PATCH] Update aws-apigateway to official v2 --- aws-apigateway-go-routes/go.mod | 8 ++++---- aws-apigateway-go-routes/go.sum | 21 +++++++++++++++------ aws-apigateway-go-routes/main.go | 2 +- aws-apigateway-py-routes/requirements.txt | 2 +- aws-apigateway-ts-routes/package.json | 2 +- aws-java-eks-minimal/pom.xml | 2 +- aws-ts-apigateway-auth0/package.json | 2 +- aws-ts-apigateway/package.json | 2 +- aws-ts-slackbot/package.json | 2 +- 9 files changed, 26 insertions(+), 17 deletions(-) diff --git a/aws-apigateway-go-routes/go.mod b/aws-apigateway-go-routes/go.mod index 6e5a9ddc3..957c6bdd8 100644 --- a/aws-apigateway-go-routes/go.mod +++ b/aws-apigateway-go-routes/go.mod @@ -1,11 +1,11 @@ module github.com/pulumi/examples/aws-apigateway-go-routes -go 1.19 +go 1.21 require ( github.com/aws/aws-lambda-go v1.27.0 - github.com/pulumi/pulumi-aws-apigateway/sdk v1.1.0-alpha.3 - github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4 + github.com/pulumi/pulumi-aws-apigateway/sdk/v2 v2.0.0 + github.com/pulumi/pulumi-aws/sdk/v6 v6.5.0 github.com/pulumi/pulumi/sdk/v3 v3.81.0 ) @@ -65,7 +65,7 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/objx v0.2.0 // indirect + github.com/stretchr/objx v0.5.0 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect diff --git a/aws-apigateway-go-routes/go.sum b/aws-apigateway-go-routes/go.sum index 55cf702ca..cddb3425b 100644 --- a/aws-apigateway-go-routes/go.sum +++ b/aws-apigateway-go-routes/go.sum @@ -1,5 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I= @@ -51,6 +52,7 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= @@ -97,6 +99,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -107,6 +110,7 @@ github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= @@ -144,10 +148,10 @@ github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk= github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pulumi/pulumi-aws-apigateway/sdk v1.1.0-alpha.3 h1:AbeIa9FUvpr5hoN/Jk+5ZTspuHmIgvmx1YRnSTFFVk8= -github.com/pulumi/pulumi-aws-apigateway/sdk v1.1.0-alpha.3/go.mod h1:/GMyOlowMMpGo1fm3M0wgee4lxtrFbfBlkrUCUq2rvE= -github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4 h1:VSLvAi+/kZt0k+KjMZ9zd8/NJ5w3vsS0RUKX3vwFa1A= -github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4/go.mod h1:amR/FWXmTqZI5ZtR/5JASorWmOqAIif+FVBSBEZ0uOw= +github.com/pulumi/pulumi-aws-apigateway/sdk/v2 v2.0.0 h1:oSmjanBxu522lvh5MeWbiXf3HPawcTT+6qA/MGGopms= +github.com/pulumi/pulumi-aws-apigateway/sdk/v2 v2.0.0/go.mod h1:bz463xt5GSwmzN2FpIH4pA2pF9dCEtVznp9AX20H8/U= +github.com/pulumi/pulumi-aws/sdk/v6 v6.5.0 h1:ouyCTAVyK7oeWPbAhWOd6mZQTIt3/56/Zc3OsLnvYLA= +github.com/pulumi/pulumi-aws/sdk/v6 v6.5.0/go.mod h1:UeOesX8l9ntIiiKXdQue8/rQDAvSf7Spd5qf15qngcY= github.com/pulumi/pulumi/sdk/v3 v3.81.0 h1:d711GUpjZK1beNpIKFReC1LBmHXYE684sYWntJWQ4Q0= github.com/pulumi/pulumi/sdk/v3 v3.81.0/go.mod h1:RMilNNVMlmK1h4Nl/qylb9vzbgh4F3mufZoUOnPy98o= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -176,15 +180,19 @@ github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRM github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8= github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 h1:X9dsIWPuuEJlPX//UmRKophhOKCGXc46RVIGuttks68= @@ -319,6 +327,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw= lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s= pgregory.net/rapid v0.6.1 h1:4eyrDxyht86tT4Ztm+kvlyNBLIk071gR+ZQdhphc9dQ= +pgregory.net/rapid v0.6.1/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 h1:hfyJ5ku9yFtLVOiSxa3IN+dx5eBQT9mPmKFypAmg8XM= sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/aws-apigateway-go-routes/main.go b/aws-apigateway-go-routes/main.go index 1c28dd314..5ed24b188 100644 --- a/aws-apigateway-go-routes/main.go +++ b/aws-apigateway-go-routes/main.go @@ -2,7 +2,7 @@ package main import ( - apigateway "github.com/pulumi/pulumi-aws-apigateway/sdk/go/apigateway" + apigateway "github.com/pulumi/pulumi-aws-apigateway/sdk/v2/go/apigateway" awsapigateway "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/apigateway" "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/cognito" "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/route53" diff --git a/aws-apigateway-py-routes/requirements.txt b/aws-apigateway-py-routes/requirements.txt index bdf417048..3702e9eea 100644 --- a/aws-apigateway-py-routes/requirements.txt +++ b/aws-apigateway-py-routes/requirements.txt @@ -1,3 +1,3 @@ pulumi>=3.0.0,<4.0.0 pulumi-aws>=6.0.2,<7.0.0 -pulumi-aws-apigateway==1.1.0a3 +pulumi-aws-apigateway>=2.0.0,<3.0.0 diff --git a/aws-apigateway-ts-routes/package.json b/aws-apigateway-ts-routes/package.json index 1497a60e7..eaf1fc7b8 100644 --- a/aws-apigateway-ts-routes/package.json +++ b/aws-apigateway-ts-routes/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.2", - "@pulumi/aws-apigateway": "1.1.0-alpha.3", + "@pulumi/aws-apigateway": "^2.0.0", "@pulumi/pulumi": "^3.3.1", "aws-lambda": "^1.0.7" } diff --git a/aws-java-eks-minimal/pom.xml b/aws-java-eks-minimal/pom.xml index 8e37b61ae..f546d2cfd 100644 --- a/aws-java-eks-minimal/pom.xml +++ b/aws-java-eks-minimal/pom.xml @@ -36,7 +36,7 @@ com.pulumi eks - (,1.0] + [2.0,3.0) diff --git a/aws-ts-apigateway-auth0/package.json b/aws-ts-apigateway-auth0/package.json index b5b65e389..90d9dddb3 100644 --- a/aws-ts-apigateway-auth0/package.json +++ b/aws-ts-apigateway-auth0/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@pulumi/aws": "^6.0.0", - "@pulumi/aws-apigateway": "1.1.0-alpha.3", + "@pulumi/aws-apigateway": "^2.0.0", "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0", "@types/auth0-js": "^9.10.1", diff --git a/aws-ts-apigateway/package.json b/aws-ts-apigateway/package.json index 6e72188f0..9bfe22acf 100644 --- a/aws-ts-apigateway/package.json +++ b/aws-ts-apigateway/package.json @@ -5,7 +5,7 @@ "@aws-sdk/client-dynamodb": "^3.423.0", "@aws-sdk/lib-dynamodb": "^3.423.0", "@pulumi/aws": "^6.0.0", - "@pulumi/aws-apigateway": "^2.0.0-alpha.1", + "@pulumi/aws-apigateway": "^2.0.0", "@pulumi/pulumi": "^3.0.0" } } diff --git a/aws-ts-slackbot/package.json b/aws-ts-slackbot/package.json index d6eebb970..5929230b6 100644 --- a/aws-ts-slackbot/package.json +++ b/aws-ts-slackbot/package.json @@ -6,7 +6,7 @@ "@aws-sdk/client-sns": "^3.414.0", "@aws-sdk/lib-dynamodb": "^3.417.0", "@pulumi/aws": "^6.0.0", - "@pulumi/aws-apigateway": "1.1.0-alpha.3", + "@pulumi/aws-apigateway": "^2.0.0", "@pulumi/awsx": "^2.0.2", "@pulumi/pulumi": "^3.0.0", "qs": "^6.7.0",