Skip to content

Commit bb5cfb5

Browse files
authored
upgrade to aws provider v6 (#18)
Signed-off-by: Andrey Devyatkin <andrey.devyatkin@fivexl.io>
1 parent 0304b7f commit bb5cfb5

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Local .terraform directories
22
**/.terraform/*
3+
.terraform.lock.hcl
34

45
# .tfstate files
56
*.tfstate

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ No resources.
7878
| <a name="input_hash_algorithm"></a> [hash\_algorithm](#input\_hash\_algorithm) | The hash algorithm that would be used to encode account\_id and region. This is uselful to avoid leaking account\_id and region in the resource name (for example in public S3 bucket names). Possible values are 'sha1' \| null. Defaults to 'sha1' | `string` | `"sha1"` | no |
7979
| <a name="input_max_length"></a> [max\_length](#input\_max\_length) | The maximum length of the resource name. Defaults to 255 | `number` | `null` | no |
8080
| <a name="input_names"></a> [names](#input\_names) | The names of the resources to generate | `list(string)` | `[]` | no |
81-
| <a name="input_order"></a> [order](#input\_order) | The order of the name components | `list(string)` | <pre>[<br> "name",<br> "region",<br> "env_id"<br>]</pre> | no |
81+
| <a name="input_order"></a> [order](#input\_order) | The order of the name components | `list(string)` | <pre>[<br/> "name",<br/> "region",<br/> "env_id"<br/>]</pre> | no |
8282
| <a name="input_resource_type"></a> [resource\_type](#input\_resource\_type) | The type of resource to generate a name for. Possible values are 's3' \| 'dynamodb'. | `string` | `"none"` | no |
8383
| <a name="input_with_env_id"></a> [with\_env\_id](#input\_with\_env\_id) | Whether to include the environment id in the name | `bool` | `true` | no |
8484
| <a name="input_with_region"></a> [with\_region](#input\_with\_region) | Whether to include the region in the name | `bool` | `false` | no |
@@ -92,8 +92,10 @@ No resources.
9292
| <a name="output_chat_bot_topic_arn_ssm_parameter_name"></a> [chat\_bot\_topic\_arn\_ssm\_parameter\_name](#output\_chat\_bot\_topic\_arn\_ssm\_parameter\_name) | Name of the SSM parameter for the Chatbot topic ARN |
9393
| <a name="output_default_kms_key_resource_share_name"></a> [default\_kms\_key\_resource\_share\_name](#output\_default\_kms\_key\_resource\_share\_name) | Name of the RAM resource share for the default KMS key |
9494
| <a name="output_names"></a> [names](#output\_names) | The generated names for the resources |
95-
| <a name="output_org_info_ram_resource_share_name"></a> [org\_info\_ram\_resource\_share\_name](#output\_org\_info\_ram\_resource\_share\_name) | Name of the RAM resource share for the organization information ssm parameter |
96-
| <a name="output_org_info_ssm_parameter_name"></a> [org\_info\_ssm\_parameter\_name](#output\_org\_info\_ssm\_parameter\_name) | Name of the ssm parameter with the organization information |
95+
| <a name="output_org_info_ram_resource_share_name"></a> [org\_info\_ram\_resource\_share\_name](#output\_org\_info\_ram\_resource\_share\_name) | Deprecated, will be removed in the next major release. Name of the RAM resource share for the organization information ssm parameter |
96+
| <a name="output_org_info_ram_resource_share_names"></a> [org\_info\_ram\_resource\_share\_names](#output\_org\_info\_ram\_resource\_share\_names) | This is a map of the RAM resource share names for the 'org\_info' shared ssm parameter. |
97+
| <a name="output_org_info_ssm_parameter_name"></a> [org\_info\_ssm\_parameter\_name](#output\_org\_info\_ssm\_parameter\_name) | Deprecated, will be removed in the next major release. Name of the ssm parameter with the organization information |
98+
| <a name="output_org_info_ssm_parametes_names"></a> [org\_info\_ssm\_parametes\_names](#output\_org\_info\_ssm\_parametes\_names) | This is a map of the SSM parameter names for the 'org\_info' shared ssm parameter. |
9799
| <a name="output_s3_access_logs_bucket_name"></a> [s3\_access\_logs\_bucket\_name](#output\_s3\_access\_logs\_bucket\_name) | The name of the S3 bucket for storing access logs |
98100
| <a name="output_s3_access_logs_replication_configuration_resource_share_name"></a> [s3\_access\_logs\_replication\_configuration\_resource\_share\_name](#output\_s3\_access\_logs\_replication\_configuration\_resource\_share\_name) | Name of the RAM resource share for the S3 access logs replication configuration |
99101
| <a name="output_s3_access_logs_replication_configuration_ssm_parameter_name"></a> [s3\_access\_logs\_replication\_configuration\_ssm\_parameter\_name](#output\_s3\_access\_logs\_replication\_configuration\_ssm\_parameter\_name) | Name of the SSM parameter for the S3 access logs replication configuration |

modules/naming_generator/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
locals {
33
account_id = data.aws_caller_identity.current.account_id
4-
region = data.aws_region.current.name
4+
region = data.aws_region.current.region
55

66
env_id = format("%s-%s", local.account_id, local.region)
77

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
terraform {
2-
required_version = "~>1.3"
2+
required_version = "~>1"
33
required_providers {
44
aws = {
55
source = "hashicorp/aws"
6-
version = ">= 5.27.0, < 6.0.0"
6+
version = ">= 6.0.0, < 7.0.0"
77
}
88
}
99
}

0 commit comments

Comments
 (0)