Skip to content

Commit 9e6b80f

Browse files
authored
fix: adjust_versions_variables_outputs (#20)
1 parent 6ac833b commit 9e6b80f

File tree

6 files changed

+22
-18
lines changed

6 files changed

+22
-18
lines changed

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Terraform module which create a dynamodb tables incl. indices and scaling via th
66

77
| Name | Version |
88
|------|---------|
9-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.6 |
9+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
1010

1111
## Providers
1212

@@ -16,9 +16,9 @@ No providers.
1616

1717
| Name | Source | Version |
1818
|------|--------|---------|
19-
| <a name="module_table"></a> [table](#module\_table) | github.com/justtrackio/terraform-aws-dynamodb-table | v1.0.1 |
20-
| <a name="module_table_label"></a> [table\_label](#module\_table\_label) | cloudposse/label/null | 0.25.0 |
21-
| <a name="module_this"></a> [this](#module\_this) | cloudposse/label/null | 0.25.0 |
19+
| <a name="module_table"></a> [table](#module\_table) | justtrackio/dynamodb-table/aws | 1.0.4 |
20+
| <a name="module_table_label"></a> [table\_label](#module\_table\_label) | justtrackio/label/null | 0.26.0 |
21+
| <a name="module_this"></a> [this](#module\_this) | justtrackio/label/null | 0.26.0 |
2222

2323
## Resources
2424

@@ -31,6 +31,8 @@ No resources.
3131
| <a name="input_additional_tag_map"></a> [additional\_tag\_map](#input\_additional\_tag\_map) | Additional key-value pairs to add to each map in `tags_as_list_of_maps`. Not added to `tags` or `id`.<br>This is for some rare cases where resources want additional configuration of tags<br>and therefore take a list of maps with tag key, value, and additional configuration. | `map(string)` | `{}` | no |
3232
| <a name="input_attributes"></a> [attributes](#input\_attributes) | ID element. Additional attributes (e.g. `workers` or `cluster`) to add to `id`,<br>in the order they appear in the list. New attributes are appended to the<br>end of the list. The elements of the list are joined by the `delimiter`<br>and treated as a single ID element. | `list(string)` | `[]` | no |
3333
| <a name="input_attributes_as_suffix"></a> [attributes\_as\_suffix](#input\_attributes\_as\_suffix) | Attributes passed into the module are put in front of each.key (model name) by default. Setting this to true will put the attributes after the each.key. | `bool` | `false` | no |
34+
| <a name="input_aws_account_id"></a> [aws\_account\_id](#input\_aws\_account\_id) | AWS account id | `string` | `null` | no |
35+
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS region | `string` | `null` | no |
3436
| <a name="input_context"></a> [context](#input\_context) | Single object for setting entire context at once.<br>See description of individual variables for details.<br>Leave string and numeric variables as `null` to use default value.<br>Individual variable settings (non-null) override settings in context object,<br>except for attributes, tags, and additional\_tag\_map, which are merged. | `any` | <pre>{<br> "additional_tag_map": {},<br> "attributes": [],<br> "delimiter": null,<br> "descriptor_formats": {},<br> "enabled": true,<br> "environment": null,<br> "id_length_limit": null,<br> "label_key_case": null,<br> "label_order": [],<br> "label_value_case": null,<br> "labels_as_tags": [<br> "unset"<br> ],<br> "name": null,<br> "namespace": null,<br> "regex_replace_chars": null,<br> "stage": null,<br> "tags": {},<br> "tenant": null<br>}</pre> | no |
3537
| <a name="input_delimiter"></a> [delimiter](#input\_delimiter) | Delimiter to be used between ID elements.<br>Defaults to `-` (hyphen). Set to `""` to use no delimiter at all. | `string` | `null` | no |
3638
| <a name="input_descriptor_formats"></a> [descriptor\_formats](#input\_descriptor\_formats) | Describe additional descriptors to be output in the `descriptors` output map.<br>Map of maps. Keys are names of descriptors. Values are maps of the form<br>`{<br> format = string<br> labels = list(string)<br>}`<br>(Type is `any` so the map values can later be enhanced to provide additional options.)<br>`format` is a Terraform format string to be passed to the `format()` function.<br>`labels` is a list of labels, in order, to pass to `format()` function.<br>Label values will be normalized before being passed to `format()` so they will be<br>identical to how they appear in `id`.<br>Default is `{}` (`descriptors` output will be empty). | `any` | `{}` | no |
@@ -43,6 +45,7 @@ No resources.
4345
| <a name="input_labels_as_tags"></a> [labels\_as\_tags](#input\_labels\_as\_tags) | Set of labels (ID elements) to include as tags in the `tags` output.<br>Default is to include all labels.<br>Tags with empty values will not be included in the `tags` output.<br>Set to `[]` to suppress all generated tags.<br>**Notes:**<br> The value of the `name` tag, if included, will be the `id`, not the `name`.<br> Unlike other `null-label` inputs, the initial setting of `labels_as_tags` cannot be<br> changed in later chained modules. Attempts to change it will be silently ignored. | `set(string)` | <pre>[<br> "default"<br>]</pre> | no |
4446
| <a name="input_name"></a> [name](#input\_name) | ID element. Usually the component or solution name, e.g. 'app' or 'jenkins'.<br>This is the only ID element not also included as a `tag`.<br>The "name" tag is set to the full `id` string. There is no tag with the value of the `name` input. | `string` | `null` | no |
4547
| <a name="input_namespace"></a> [namespace](#input\_namespace) | ID element. Usually an abbreviation of your organization name, e.g. 'eg' or 'cp', to help ensure generated IDs are globally unique | `string` | `null` | no |
48+
| <a name="input_organizational_unit"></a> [organizational\_unit](#input\_organizational\_unit) | Usually used to indicate the AWS organizational unit, e.g. 'prod', 'sdlc' | `string` | `null` | no |
4649
| <a name="input_regex_replace_chars"></a> [regex\_replace\_chars](#input\_regex\_replace\_chars) | Terraform regular expression (regex) string.<br>Characters matching the regex will be removed from the ID elements.<br>If not set, `"/[^a-zA-Z0-9-]/"` is used to remove all characters other than hyphens, letters and digits. | `string` | `null` | no |
4750
| <a name="input_stage"></a> [stage](#input\_stage) | ID element. Usually used to indicate role, e.g. 'prod', 'staging', 'source', 'build', 'test', 'deploy', 'release' | `string` | `null` | no |
4851
| <a name="input_tables"></a> [tables](#input\_tables) | Tables to be created | <pre>map(object({<br> autoscaler = optional(object({<br> attributes = optional(list(string), [])<br> enabled = optional(bool, true)<br> max_read_capacity = optional(number, 1000)<br> max_write_capacity = optional(number, 1000)<br> min_read_capacity = optional(number, 1)<br> min_write_capacity = optional(number, 1)<br> read_schedule = optional(list(object({<br> schedule = string<br> min_capacity = number<br> max_capacity = number<br> })), [])<br> read_schedule_index = optional(list(object({<br> schedule = string<br> min_capacity = number<br> max_capacity = number<br> })), [])<br> read_target = optional(number, 75)<br> write_schedule = optional(list(object({<br> schedule = string<br> min_capacity = number<br> max_capacity = number<br> })), [])<br> write_schedule_index = optional(list(object({<br> schedule = string<br> min_capacity = number<br> max_capacity = number<br> })), [])<br> write_target = optional(number, 75)<br> tags = optional(map(string), {})<br> }), {})<br> global_secondary_index_map = optional(list(object({<br> hash_key = string<br> name = string<br> non_key_attributes = list(string)<br> projection_type = string<br> range_key = string<br> read_capacity = number<br> write_capacity = number<br> })), [])<br> local_secondary_index_map = optional(list(object({<br> name = string<br> non_key_attributes = list(string)<br> projection_type = string<br> range_key = string<br> })), [])<br> table = object({<br> attributes = optional(list(object({<br> name = string<br> type = string<br> })), [])<br> billing_mode = optional(string, "PROVISIONED")<br> encryption = optional(object({<br> enabled = optional(bool, false)<br> kms_key_arn = optional(string, "")<br> }), {})<br> point_in_time_recovery = optional(object({<br> enabled = optional(bool, false)<br> }), {})<br> streams = optional(object({<br> enabled = optional(bool, false)<br> view_type = optional(string, "")<br> }), {})<br> exists = optional(bool, true)<br> hash_key = string<br> hash_key_type = optional(string, "S")<br> range_key = optional(string, "")<br> range_key_type = optional(string, "S")<br> replicas = optional(list(string), [])<br> tags = optional(object({<br> enabled = optional(bool, true)<br> }), {})<br> ttl = optional(object({<br> attribute = optional(string, "ttl")<br> enabled = optional(bool, true)<br> }), {})<br> })<br> }))</pre> | `{}` | no |

examples/basic/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ terraform {
22
required_providers {
33
aws = {
44
source = "hashicorp/aws"
5-
version = "4.45.0"
5+
version = ">= 4.67"
66
}
77
}
88

9-
required_version = "1.3.6"
9+
required_version = ">= 1.3.0"
1010
}

examples/full/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ terraform {
22
required_providers {
33
aws = {
44
source = "hashicorp/aws"
5-
version = "4.45.0"
5+
version = ">= 4.67"
66
}
77
}
88

9-
required_version = "1.3.6"
9+
required_version = ">= 1.3.0"
1010
}

main.tf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "table_label" {
2-
source = "cloudposse/label/null"
3-
version = "0.25.0" # requires Terraform >= 0.13.0
2+
source = "justtrackio/label/null"
3+
version = "0.26.0" # requires Terraform >= 0.13.0
44

55
for_each = var.tables
66

@@ -24,7 +24,8 @@ module "table_label" {
2424
}
2525

2626
module "table" {
27-
source = "github.com/justtrackio/terraform-aws-dynamodb-table?ref=v1.0.1"
27+
source = "justtrackio/dynamodb-table/aws"
28+
version = "1.0.4"
2829

2930
for_each = var.tables
3031

variables.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
variable "attributes_as_suffix" {
2+
type = bool
3+
description = "Attributes passed into the module are put in front of each.key (model name) by default. Setting this to true will put the attributes after the each.key."
4+
default = false
5+
}
6+
17
variable "tables" {
28
type = map(object({
39
autoscaler = optional(object({
@@ -81,9 +87,3 @@ variable "tables" {
8187
description = "Tables to be created"
8288
default = {}
8389
}
84-
85-
variable "attributes_as_suffix" {
86-
type = bool
87-
description = "Attributes passed into the module are put in front of each.key (model name) by default. Setting this to true will put the attributes after the each.key."
88-
default = false
89-
}

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
terraform {
2-
required_version = ">= 1.3.6"
2+
required_version = ">= 1.3.0"
33
}

0 commit comments

Comments
 (0)