Skip to content

Commit 8851f3c

Browse files
stevengorrellstevengorrell
authored
Merge pull request #13 from rackspace-infrastructure-automation/provider-update
Update AWS provider
2 parents badd1e7 + 96ae53e commit 8851f3c

File tree

8 files changed

+90
-31
lines changed

8 files changed

+90
-31
lines changed

‎README.md‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This module sets up a sqs-queue with varying options including deadletter, fifo,
66

77
```
88
module "standard_queue" {
9-
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.0"
9+
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.3"
1010
1111
create_internal_zone_record = true
1212
delay_seconds = 90
@@ -40,16 +40,35 @@ terraform state mv module.<MODULE_NAME>.aws_sqs_queue.MyQueue module.<MODULE_NAM
4040
terraform state mv module.<MODULE_NAME>.aws_sqs_queue_policy.sqs-policy module.<MODULE_NAME>.aws_sqs_queue_policy.sqs_policy
4141
```
4242

43+
## Requirements
44+
45+
| Name | Version |
46+
|------|---------|
47+
| terraform | >= 0.13 |
48+
| aws | >= 4.0 |
49+
4350
## Providers
4451

4552
| Name | Version |
4653
|------|---------|
47-
| aws | >= 2.7.0 |
54+
| aws | >= 4.0 |
55+
56+
## Modules
57+
58+
No Modules.
59+
60+
## Resources
61+
62+
| Name |
63+
|------|
64+
| [aws_route53_record](https://registry.terraform.io/providers/hashicorp/aws/4.0/docs/resources/route53_record) |
65+
| [aws_sqs_queue](https://registry.terraform.io/providers/hashicorp/aws/4.0/docs/resources/sqs_queue) |
66+
| [aws_sqs_queue_policy](https://registry.terraform.io/providers/hashicorp/aws/4.0/docs/resources/sqs_queue_policy) |
4867

4968
## Inputs
5069

5170
| Name | Description | Type | Default | Required |
52-
|------|-------------|------|---------|:-----:|
71+
|------|-------------|------|---------|:--------:|
5372
| content\_based\_deduplication | Enables content-based deduplication for FIFO queues. | `bool` | `false` | no |
5473
| create\_internal\_zone\_record | Create Route 53 internal zone record for the SQS QUEUE. i.e true \| false | `bool` | `false` | no |
5574
| dead\_letter\_target\_arn | The Amazon Resource Name (ARN) of the dead-letter queue to which Amazon SQS moves messages | `string` | `""` | no |
@@ -78,4 +97,3 @@ terraform state mv module.<MODULE_NAME>.aws_sqs_queue_policy.sqs-policy module.<
7897
|------|-------------|
7998
| arn | The ARN of the SQS queue |
8099
| id | The URL for the created Amazon SQS queue. |
81-

‎examples/deadletter.tf‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 4.0"
8+
}
9+
}
310
}
411

512
provider "aws" {
6-
version = "~> 2.7"
7-
region = "us-east-1"
13+
region = "us-east-1"
814
}
915

1016
data "aws_caller_identity" "current" {
@@ -15,7 +21,7 @@ resource "aws_route53_zone" "testing_zone" {
1521
}
1622

1723
module "deadletter_queue" {
18-
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.0"
24+
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.3"
1925

2026
create_internal_zone_record = true
2127
enable_sqs_queue_policy = true
@@ -27,7 +33,7 @@ module "deadletter_queue" {
2733
}
2834

2935
module "dl_source_queue" {
30-
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.0"
36+
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.3"
3137

3238
create_internal_zone_record = true
3339
dead_letter_target_arn = module.deadletter_queue.arn

‎examples/fifo-encryption.tf‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 4.0"
8+
}
9+
}
310
}
411

12+
513
provider "aws" {
6-
version = "~> 2.7"
7-
region = "us-east-1"
14+
region = "us-east-1"
815
}
916

1017
data "aws_caller_identity" "current" {
1118
}
1219

1320
module "fifo_encryption_queue" {
14-
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.0"
21+
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.3"
1522

1623
content_based_deduplication = true
1724
create_internal_zone_record = true

‎examples/fifo.tf‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 4.0"
8+
}
9+
}
310
}
411

512
provider "aws" {
6-
version = "~> 2.7"
7-
region = "us-east-1"
13+
region = "us-east-1"
814
}
915

1016
data "aws_caller_identity" "current" {
1117
}
1218

1319
module "fifo_queue" {
14-
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.0"
20+
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.3"
1521

1622
content_based_deduplication = true
1723
create_internal_zone_record = true

‎examples/standard-encryption.tf‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 4.0"
8+
}
9+
}
310
}
411

512
provider "aws" {
6-
version = "~> 2.7"
7-
region = "us-east-1"
13+
region = "us-east-1"
814
}
915

1016
data "aws_caller_identity" "current" {
1117
}
1218

1319
module "encryption_queue" {
14-
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.0"
20+
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.3"
1521

1622
create_internal_zone_record = true
1723
delay_seconds = 90

‎examples/standard.tf‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 4.0"
8+
}
9+
}
310
}
411

12+
513
provider "aws" {
6-
version = "~> 2.7"
7-
region = "us-east-1"
14+
region = "us-east-1"
815
}
916

1017
data "aws_caller_identity" "current" {
@@ -15,7 +22,7 @@ resource "aws_route53_zone" "testing_zone" {
1522
}
1623

1724
module "standard_queue" {
18-
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.0"
25+
source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.3"
1926

2027
create_internal_zone_record = true
2128
delay_seconds = 90

‎main.tf‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* ```
99
* module "standard_queue" {
10-
* source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.0"
10+
* source = "git@github.com:rackspace-infrastructure-automation/aws-terraform-sqs//?ref=v0.12.3"
1111
*
1212
* create_internal_zone_record = true
1313
* delay_seconds = 90
@@ -43,10 +43,13 @@
4343
*/
4444

4545
terraform {
46-
required_version = ">= 0.12"
46+
required_version = ">= 0.13"
4747

4848
required_providers {
49-
aws = ">= 2.7.0"
49+
aws = {
50+
source = "hashicorp/aws"
51+
version = ">= 4.0"
52+
}
5053
}
5154
}
5255

‎tests/test1/main.tf‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 4.0"
8+
}
9+
}
310
}
411

512
provider "aws" {
6-
region = "us-west-2"
7-
version = "~> 3.0"
13+
region = "us-west-2"
814
}
915

1016
data "aws_caller_identity" "current" {

0 commit comments

Comments
 (0)