Skip to content

Commit

Permalink
Merge pull request #31 from hashicorp/main
Browse files Browse the repository at this point in the history 
Fork Sync: Update from parent repository
  • Loading branch information
@mbialon
mbialon authored Sep 28, 2023
2 parents f0e536d + 327bc38 commit 985181e
Show file tree
Hide file tree
Showing 13 changed files with 171 additions and 49 deletions.
3 changes: 3 additions & 0 deletions .changelog/33662.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_cloud9_environment_ec2: Add `ubuntu-22.04-x86_64` and `resolve:ssm:/aws/service/cloud9/amis/ubuntu-22.04-x86_64` as valid values for `image_id`
```
2 changes: 1 addition & 1 deletion .ci/providerlint/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-aws/ci/providerlint
go 1.20

require (
github.com/aws/aws-sdk-go v1.45.17
github.com/aws/aws-sdk-go v1.45.18
github.com/bflad/tfproviderlint v0.29.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
golang.org/x/tools v0.8.0
Expand Down
4 changes: 2 additions & 2 deletions .ci/providerlint/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki
github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
github.com/aws/aws-sdk-go v1.45.17 h1:EclP31IdsIVaHNgIlUtvFIDuyFUtTCa9oYthZmGlZ1U=
github.com/aws/aws-sdk-go v1.45.17/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go v1.45.18 h1:uSOGg4LFtpQH/bq9FsumMKfZHNl7BdH7WURHOqKXHNU=
github.com/aws/aws-sdk-go v1.45.18/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/bflad/gopaniccheck v0.1.0 h1:tJftp+bv42ouERmUMWLoUn/5bi/iQZjHPznM00cP/bU=
github.com/bflad/gopaniccheck v0.1.0/go.mod h1:ZCj2vSr7EqVeDaqVsWN4n2MwdROx1YL+LFo47TSWtsA=
github.com/bflad/tfproviderlint v0.29.0 h1:zxKYAAM6IZ4ace1a3LX+uzMRIMP8L+iOtEc+FP2Yoow=
Expand Down
131 changes: 131 additions & 0 deletions .ci/providerlint/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci/providerlint/vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ github.com/agext/levenshtein
# github.com/apparentlymart/go-textseg/v15 v15.0.0
## explicit; go 1.16
github.com/apparentlymart/go-textseg/v15/textseg
# github.com/aws/aws-sdk-go v1.45.17
# github.com/aws/aws-sdk-go v1.45.18
## explicit; go 1.11
github.com/aws/aws-sdk-go/aws/awserr
github.com/aws/aws-sdk-go/aws/endpoints
Expand Down
2 changes: 1 addition & 1 deletion .ci/tools/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/YakDriver/tfproviderdocs v0.11.0
github.com/client9/misspell v0.3.4
github.com/golangci/golangci-lint v1.54.2
github.com/hashicorp/copywrite v0.16.4
github.com/hashicorp/copywrite v0.16.5
github.com/hashicorp/go-changelog v0.0.0-20201005170154-56335215ce3a
github.com/katbyte/terrafmt v0.5.2
github.com/pavius/impi v0.0.3
Expand Down
4 changes: 2 additions & 2 deletions .ci/tools/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,8 +621,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ=
github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
github.com/hashicorp/copywrite v0.16.4 h1:qDuO1wJJZx30SCEqxJnFuStXK43R39juJKMMTn/u/9c=
github.com/hashicorp/copywrite v0.16.4/go.mod h1:6wvQH+ICDoD2bpjO1RJ6fi+h3aY5NeLEM12oTkEtFoc=
github.com/hashicorp/copywrite v0.16.5 h1:xAX4gkLPPGxWkHGE+NY6Lzh2I8VQu9qm+N86MkSVBn4=
github.com/hashicorp/copywrite v0.16.5/go.mod h1:6wvQH+ICDoD2bpjO1RJ6fi+h3aY5NeLEM12oTkEtFoc=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_target.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Add comment to add helpful context for new contributors'
uses: actions/first-interaction@1d8459ca65b335265f1285568221e229d45a995e # v1.1.1
uses: actions/first-interaction@1dbfe1ba5525b8257e1f259b09745bee346d62d8 # v1.2.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
pr-message: |-
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.20
require (
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95
github.com/YakDriver/regexache v0.23.0
github.com/aws/aws-sdk-go v1.45.17
github.com/aws/aws-sdk-go v1.45.18
github.com/aws/aws-sdk-go-v2 v1.21.0
github.com/aws/aws-sdk-go-v2/config v1.18.42
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11
Expand Down Expand Up @@ -59,7 +59,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/s3control v1.33.0
github.com/aws/aws-sdk-go-v2/service/scheduler v1.3.0
github.com/aws/aws-sdk-go-v2/service/securitylake v1.7.0
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.20.0
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.20.1
github.com/aws/aws-sdk-go-v2/service/signer v1.16.5
github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0
github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.17.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmms
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/aws/aws-sdk-go v1.45.17 h1:EclP31IdsIVaHNgIlUtvFIDuyFUtTCa9oYthZmGlZ1U=
github.com/aws/aws-sdk-go v1.45.17/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go v1.45.18 h1:uSOGg4LFtpQH/bq9FsumMKfZHNl7BdH7WURHOqKXHNU=
github.com/aws/aws-sdk-go v1.45.18/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc=
github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 h1:OPLEkmhXf6xFPiz0bLeDArZIDx1NNS4oJyG4nv3Gct0=
Expand Down Expand Up @@ -156,8 +156,8 @@ github.com/aws/aws-sdk-go-v2/service/scheduler v1.3.0 h1:uzCEL2ILopsOcWvbmeMmmy3
github.com/aws/aws-sdk-go-v2/service/scheduler v1.3.0/go.mod h1:cdpHC7Nd4Yvtf/rhRqyqqI0fzoCb0fpo2oOFVZ0HTeQ=
github.com/aws/aws-sdk-go-v2/service/securitylake v1.7.0 h1:Ou2rjk3siybv09bzpi5fs+9zOYZACxT1LT0KkcDAtIs=
github.com/aws/aws-sdk-go-v2/service/securitylake v1.7.0/go.mod h1:/MCawoN8Xib5q04k2HsIQ+K2cNtC3CHamrfLZXd6KmA=
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.20.0 h1:BVjuGDN2ek2gjSB46aIODXIYq3Aw/o0F/ZwBPP883GU=
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.20.0/go.mod h1:qpAr/ear7teIUoBd1gaPbvavdICoo1XyAIHPVlyawQc=
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.20.1 h1:QxzS/Hr5kixvMyPIXTfspnRUiKgFJSTPrhnglAi2YLI=
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.20.1/go.mod h1:qpAr/ear7teIUoBd1gaPbvavdICoo1XyAIHPVlyawQc=
github.com/aws/aws-sdk-go-v2/service/signer v1.16.5 h1:nqZqDR44/ao9zQXyuCJI8L/C3QQIo4wtZyLtgwJfpEY=
github.com/aws/aws-sdk-go-v2/service/signer v1.16.5/go.mod h1:gHTmxtN3p6WKxFhcOSvWBFfEbxDRFtwfxjj1S7shS64=
github.com/aws/aws-sdk-go-v2/service/sqs v1.24.5 h1:RyDpTOMEJO6ycxw1vU/6s0KLFaH3M0z/z9gXHSndPTk=
Expand Down
2 changes: 2 additions & 0 deletions internal/service/cloud9/environment_ec2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@ func ResourceEnvironmentEC2() *schema.Resource {
"amazonlinux-1-x86_64",
"amazonlinux-2-x86_64",
"ubuntu-18.04-x86_64",
"ubuntu-22.04-x86_64",
"resolve:ssm:/aws/service/cloud9/amis/amazonlinux-1-x86_64",
"resolve:ssm:/aws/service/cloud9/amis/amazonlinux-2-x86_64",
"resolve:ssm:/aws/service/cloud9/amis/ubuntu-18.04-x86_64",
"resolve:ssm:/aws/service/cloud9/amis/ubuntu-22.04-x86_64",
}, false),
},
"instance_type": {
Expand Down
Loading

0 comments on commit 985181e

Please sign in to comment.