Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new resources: aws_lightsail_container_service and aws_lightsail_container_service_deployment_version #20625

Merged
merged 14 commits into from
Jun 14, 2022
Merged

Add new resources: aws_lightsail_container_service and aws_lightsail_container_service_deployment_version #20625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6cddc93
Add resource_aws_lightsail_container_service
KaguraKagura Jul 19, 2021
a883cf4
Add changelog entry 20625.txt
KaguraKagura Aug 19, 2021
a7c3e32
Fix some issues
KaguraKagura Aug 23, 2021
830b798
Small fix in testing
KaguraKagura Aug 24, 2021
a1daffd
Remove trailing spaces in docs
Sep 22, 2021
21ab51c
Merge branch 'main' of github.com:kagurakagura/terraform-provider-aws…
KaguraKagura Jan 14, 2022
5b90d11
Requested changes
KaguraKagura Apr 19, 2022
052d4f6
Format HCL in the AccTests
KaguraKagura May 10, 2022
96db300
quick website-lint-fix
anGie44 May 12, 2022
6784945
r/lightsail_container_service: refactor deployment
anGie44 Jun 14, 2022
e9d5e06
r/lightsail_container_service_deployment_version: new resource after …
anGie44 Jun 14, 2022
d49c1aa
Merge remote-tracking branch 'origin/main' into f-lightsail-container…
anGie44 Jun 14, 2022
0bf975d
run terrafmt; add client connection retry handlers
anGie44 Jun 14, 2022
4fa63f8
updates for semgrep rules
anGie44 Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changelog/20625.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:new-resource
aws_lightsail_container_service
```

```release-note:new-resource
aws_lightsail_container_service_deployment_version
```
15 changes: 15 additions & 0 deletions internal/conns/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/aws/aws-sdk-go/service/globalaccelerator"
"github.com/aws/aws-sdk-go/service/kafka"
"github.com/aws/aws-sdk-go/service/kinesis"
"github.com/aws/aws-sdk-go/service/lightsail"
"github.com/aws/aws-sdk-go/service/organizations"
"github.com/aws/aws-sdk-go/service/route53"
"github.com/aws/aws-sdk-go/service/route53recoverycontrolconfig"
Expand Down Expand Up @@ -443,6 +444,20 @@ func (c *Config) Client(ctx context.Context) (interface{}, diag.Diagnostics) {
}
})

client.LightsailConn.Handlers.Retry.PushBack(func(r *request.Request) {
switch r.Operation.Name {
case "CreateContainerService", "UpdateContainerService", "CreateContainerServiceDeployment":
if tfawserr.ErrMessageContains(r.Error, lightsail.ErrCodeInvalidInputException, "Please try again in a few minutes") {
r.Retryable = aws.Bool(true)
}
case "DeleteContainerService":
if tfawserr.ErrMessageContains(r.Error, lightsail.ErrCodeInvalidInputException, "Please try again in a few minutes") ||
tfawserr.ErrMessageContains(r.Error, lightsail.ErrCodeInvalidInputException, "Please wait for it to complete before trying again") {
r.Retryable = aws.Bool(true)
}
}
})

client.OrganizationsConn.Handlers.Retry.PushBack(func(r *request.Request) {
// Retry on the following error:
// ConcurrentModificationException: AWS Organizations can't complete your request because it conflicts with another attempt to modify the same entity. Try again later.
Expand Down
14 changes: 8 additions & 6 deletions internal/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,12 +1629,14 @@ func Provider() *schema.Provider {
"aws_licensemanager_association": licensemanager.ResourceAssociation(),
"aws_licensemanager_license_configuration": licensemanager.ResourceLicenseConfiguration(),

"aws_lightsail_domain": lightsail.ResourceDomain(),
"aws_lightsail_instance": lightsail.ResourceInstance(),
"aws_lightsail_instance_public_ports": lightsail.ResourceInstancePublicPorts(),
"aws_lightsail_key_pair": lightsail.ResourceKeyPair(),
"aws_lightsail_static_ip": lightsail.ResourceStaticIP(),
"aws_lightsail_static_ip_attachment": lightsail.ResourceStaticIPAttachment(),
"aws_lightsail_container_service": lightsail.ResourceContainerService(),
"aws_lightsail_container_service_deployment_version": lightsail.ResourceContainerServiceDeploymentVersion(),
"aws_lightsail_domain": lightsail.ResourceDomain(),
"aws_lightsail_instance": lightsail.ResourceInstance(),
"aws_lightsail_instance_public_ports": lightsail.ResourceInstancePublicPorts(),
"aws_lightsail_key_pair": lightsail.ResourceKeyPair(),
"aws_lightsail_static_ip": lightsail.ResourceStaticIP(),
"aws_lightsail_static_ip_attachment": lightsail.ResourceStaticIPAttachment(),

"aws_location_map": location.ResourceMap(),
"aws_location_place_index": location.ResourcePlaceIndex(),
Expand Down
Loading