Skip to content

Commit 619634c

Browse files
cytopiacytopia
authored
Merge pull request #16 from cytopia/release-0.8
Release 0.8
2 parents 8e078bd + 6ca0b80 commit 619634c

File tree

12 files changed

+30
-19
lines changed

12 files changed

+30
-19
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Build Status](https://travis-ci.com/cytopia/docker-terraform-docs.svg?branch=master)](https://travis-ci.com/cytopia/docker-terraform-docs)
44
[![Tag](https://img.shields.io/github/tag/cytopia/docker-terraform-docs.svg)](https://github.com/cytopia/docker-terraform-docs/releases)
5-
[![](https://images.microbadger.com/badges/version/cytopia/terraform-docs:latest.svg)](https://microbadger.com/images/cytopia/terraform-docs:latest "terraform-docs")
6-
[![](https://images.microbadger.com/badges/image/cytopia/terraform-docs:latest.svg)](https://microbadger.com/images/cytopia/terraform-docs:latest "terraform-docs")
5+
[![](https://images.microbadger.com/badges/version/cytopia/terraform-docs:latest.svg?kill_cache=1)](https://microbadger.com/images/cytopia/terraform-docs:latest "terraform-docs")
6+
[![](https://images.microbadger.com/badges/image/cytopia/terraform-docs:latest.svg?kill_cache=1)](https://microbadger.com/images/cytopia/terraform-docs:latest "terraform-docs")
77
[![](https://img.shields.io/badge/github-cytopia%2Fdocker--terraform--docs-red.svg)](https://github.com/cytopia/docker-terraform-docs "github.com/cytopia/docker-terraform-docs")
88
[![License](https://img.shields.io/badge/license-MIT-%233DA639.svg)](https://opensource.org/licenses/MIT)
99

@@ -33,7 +33,7 @@
3333
3434
View **[Dockerfile](https://github.com/cytopia/docker-terraform-docs/blob/master/Dockerfile)** on GitHub.
3535

36-
[![Docker hub](http://dockeri.co/image/cytopia/terraform-docs)](https://hub.docker.com/r/cytopia/terraform-docs)
36+
[![Docker hub](http://dockeri.co/image/cytopia/terraform-docs?kill_cache=1)](https://hub.docker.com/r/cytopia/terraform-docs)
3737

3838
Tiny Alpine-based multistage-build dockerized version of [terraform-docs](https://github.com/segmentio/terraform-docs)<sup>[1]</sup>,
3939
which additionally implements `terraform-docs-replace` allowing you to automatically and safely

‎data/terraform-docs.awk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@
6363
if (type ~ "object") {
6464
print " type = \"object\""
6565
} else {
66-
print " type = \"" $3 "\""
66+
# legacy quoted types: "string", "list", and "map"
67+
if ($3 ~ /^[[:space:]]*"(.*?)"[[:space:]]*$/) {
68+
print " type = " $3
69+
} else {
70+
print " type = \"" $3 "\""
71+
}
6772
}
6873
}
6974
}

‎tests/0.12/TEST-0.1.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ Stuff before terraform-docs
9898
| storage_encrypted | Specifies whether the DB instance is encrypted | `false` | no |
9999
| storage_type | One of 'standard' (magnetic), 'gp2' (general purpose SSD), or 'io1' (provisioned IOPS SSD). The default is 'io1' if iops is specified, 'standard' if not. Note that this behaviour is different from the AWS web console, where the default is 'gp2'. | `gp2` | no |
100100
| subnet_ids | A list of VPC subnet IDs | `<list>` | no |
101-
| tags | A mapping of tags to assign to security group | `<map>` | no |
102101
| tags | A mapping of tags to assign to all resources | `<map>` | no |
102+
| test_var | This is a test variable | `` | no |
103103
| timeouts | (Optional) Updated Terraform resource management timeouts. Applies to `aws_db_instance` in particular to permit resource management times | `<map>` | no |
104104
| timezone | (Optional) Time zone of the DB instance. timezone is currently only supported by Microsoft SQL Server. The timezone can only be set on creation. See MSSQL User Guide for more information. | `` | no |
105105
| use_name_prefix | Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation | `true` | no |

‎tests/0.12/TEST-0.1.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ Stuff before terraform-docs
9898
| storage_encrypted | Specifies whether the DB instance is encrypted | bool | `false` | no |
9999
| storage_type | One of 'standard' (magnetic), 'gp2' (general purpose SSD), or 'io1' (provisioned IOPS SSD). The default is 'io1' if iops is specified, 'standard' if not. Note that this behaviour is different from the AWS web console, where the default is 'gp2'. | string | `gp2` | no |
100100
| subnet_ids | A list of VPC subnet IDs | list(string) | `<list>` | no |
101-
| tags | A mapping of tags to assign to security group | map(string) | `<map>` | no |
102101
| tags | A mapping of tags to assign to all resources | map(string) | `<map>` | no |
102+
| test_var | This is a test variable | string | `` | no |
103103
| timeouts | (Optional) Updated Terraform resource management timeouts. Applies to `aws_db_instance` in particular to permit resource management times | map(string) | `<map>` | no |
104104
| timezone | (Optional) Time zone of the DB instance. timezone is currently only supported by Microsoft SQL Server. The timezone can only be set on creation. See MSSQL User Guide for more information. | string | `` | no |
105105
| use_name_prefix | Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation | bool | `true` | no |

‎tests/0.12/TEST-0.2.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ Stuff before terraform-docs
9898
| storage_encrypted | Specifies whether the DB instance is encrypted | bool | `false` | no |
9999
| storage_type | One of 'standard' (magnetic), 'gp2' (general purpose SSD), or 'io1' (provisioned IOPS SSD). The default is 'io1' if iops is specified, 'standard' if not. Note that this behaviour is different from the AWS web console, where the default is 'gp2'. | string | `gp2` | no |
100100
| subnet_ids | A list of VPC subnet IDs | list(string) | `<list>` | no |
101-
| tags | A mapping of tags to assign to security group | map(string) | `<map>` | no |
102101
| tags | A mapping of tags to assign to all resources | map(string) | `<map>` | no |
102+
| test_var | This is a test variable | string | `` | no |
103103
| timeouts | (Optional) Updated Terraform resource management timeouts. Applies to `aws_db_instance` in particular to permit resource management times | map(string) | `<map>` | no |
104104
| timezone | (Optional) Time zone of the DB instance. timezone is currently only supported by Microsoft SQL Server. The timezone can only be set on creation. See MSSQL User Guide for more information. | string | `` | no |
105105
| use_name_prefix | Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation | bool | `true` | no |

‎tests/0.12/TEST-0.3.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ Stuff before terraform-docs
9898
| storage_encrypted | Specifies whether the DB instance is encrypted | bool | `false` | no |
9999
| storage_type | One of 'standard' (magnetic), 'gp2' (general purpose SSD), or 'io1' (provisioned IOPS SSD). The default is 'io1' if iops is specified, 'standard' if not. Note that this behaviour is different from the AWS web console, where the default is 'gp2'. | string | `gp2` | no |
100100
| subnet_ids | A list of VPC subnet IDs | list(string) | `<list>` | no |
101-
| tags | A mapping of tags to assign to security group | map(string) | `<map>` | no |
102101
| tags | A mapping of tags to assign to all resources | map(string) | `<map>` | no |
102+
| test_var | This is a test variable | string | `` | no |
103103
| timeouts | (Optional) Updated Terraform resource management timeouts. Applies to `aws_db_instance` in particular to permit resource management times | map(string) | `<map>` | no |
104104
| timezone | (Optional) Time zone of the DB instance. timezone is currently only supported by Microsoft SQL Server. The timezone can only be set on creation. See MSSQL User Guide for more information. | string | `` | no |
105105
| use_name_prefix | Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation | bool | `true` | no |

‎tests/0.12/TEST-0.4.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ Stuff before terraform-docs
9898
| storage_encrypted | Specifies whether the DB instance is encrypted | bool | `false` | no |
9999
| storage_type | One of 'standard' (magnetic), 'gp2' (general purpose SSD), or 'io1' (provisioned IOPS SSD). The default is 'io1' if iops is specified, 'standard' if not. Note that this behaviour is different from the AWS web console, where the default is 'gp2'. | string | `gp2` | no |
100100
| subnet_ids | A list of VPC subnet IDs | list(string) | `[]` | no |
101-
| tags | A mapping of tags to assign to security group | map(string) | `{}` | no |
102101
| tags | A mapping of tags to assign to all resources | map(string) | `{}` | no |
102+
| test_var | This is a test variable | string | `` | no |
103103
| timeouts | (Optional) Updated Terraform resource management timeouts. Applies to `aws_db_instance` in particular to permit resource management times | map(string) | `{ "create": "40m", "delete": "40m", "update": "80m" }` | no |
104104
| timezone | (Optional) Time zone of the DB instance. timezone is currently only supported by Microsoft SQL Server. The timezone can only be set on creation. See MSSQL User Guide for more information. | string | `` | no |
105105
| use_name_prefix | Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation | bool | `true` | no |

‎tests/0.12/TEST-0.4.5.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ Stuff before terraform-docs
9797
| storage_encrypted | Specifies whether the DB instance is encrypted | bool | `false` | no |
9898
| storage_type | One of 'standard' (magnetic), 'gp2' (general purpose SSD), or 'io1' (provisioned IOPS SSD). The default is 'io1' if iops is specified, 'standard' if not. Note that this behaviour is different from the AWS web console, where the default is 'gp2'. | string | `gp2` | no |
9999
| subnet_ids | A list of VPC subnet IDs | list(string) | `[]` | no |
100-
| tags | A mapping of tags to assign to security group | map(string) | `{}` | no |
101100
| tags | A mapping of tags to assign to all resources | map(string) | `{}` | no |
101+
| test_var | This is a test variable | string | `` | no |
102102
| timeouts | (Optional) Updated Terraform resource management timeouts. Applies to `aws_db_instance` in particular to permit resource management times | map(string) | `{ "create": "40m", "delete": "40m", "update": "80m" }` | no |
103103
| timezone | (Optional) Time zone of the DB instance. timezone is currently only supported by Microsoft SQL Server. The timezone can only be set on creation. See MSSQL User Guide for more information. | string | `` | no |
104104
| use_name_prefix | Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation | bool | `true` | no |

‎tests/0.12/TEST-0.5.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ Stuff before terraform-docs
9999
| storage\_encrypted | Specifies whether the DB instance is encrypted | bool | `false` | no |
100100
| storage\_type | One of 'standard' (magnetic), 'gp2' (general purpose SSD), or 'io1' (provisioned IOPS SSD). The default is 'io1' if iops is specified, 'standard' if not. Note that this behaviour is different from the AWS web console, where the default is 'gp2'. | string | `gp2` | no |
101101
| subnet\_ids | A list of VPC subnet IDs | list(string) | `[]` | no |
102-
| tags | A mapping of tags to assign to security group | map(string) | `{}` | no |
103102
| tags | A mapping of tags to assign to all resources | map(string) | `{}` | no |
103+
| test\_var | This is a test variable | string | `` | no |
104104
| timeouts | (Optional) Updated Terraform resource management timeouts. Applies to `aws_db_instance` in particular to permit resource management times | map(string) | `{ "create": "40m", "delete": "40m", "update": "80m" }` | no |
105105
| timezone | (Optional) Time zone of the DB instance. timezone is currently only supported by Microsoft SQL Server. The timezone can only be set on creation. See MSSQL User Guide for more information. | string | `` | no |
106106
| use\_name\_prefix | Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation | bool | `true` | no |

‎tests/0.12/TEST-0.6.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ Stuff before terraform-docs
9999
| storage\_encrypted | Specifies whether the DB instance is encrypted | bool | `"false"` | no |
100100
| storage\_type | One of 'standard' (magnetic), 'gp2' (general purpose SSD), or 'io1' (provisioned IOPS SSD). The default is 'io1' if iops is specified, 'standard' if not. Note that this behaviour is different from the AWS web console, where the default is 'gp2'. | string | `"gp2"` | no |
101101
| subnet\_ids | A list of VPC subnet IDs | list(string) | `[]` | no |
102-
| tags | A mapping of tags to assign to security group | map(string) | `{}` | no |
103102
| tags | A mapping of tags to assign to all resources | map(string) | `{}` | no |
103+
| test\_var | This is a test variable | string | `""` | no |
104104
| timeouts | (Optional) Updated Terraform resource management timeouts. Applies to `aws_db_instance` in particular to permit resource management times | map(string) | `{ "create": "40m", "delete": "40m", "update": "80m" }` | no |
105105
| timezone | (Optional) Time zone of the DB instance. timezone is currently only supported by Microsoft SQL Server. The timezone can only be set on creation. See MSSQL User Guide for more information. | string | `""` | no |
106106
| use\_name\_prefix | Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation | bool | `"true"` | no |

‎tests/0.12/TEST-latest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ Stuff before terraform-docs
9999
| storage\_encrypted | Specifies whether the DB instance is encrypted | bool | `"false"` | no |
100100
| storage\_type | One of 'standard' (magnetic), 'gp2' (general purpose SSD), or 'io1' (provisioned IOPS SSD). The default is 'io1' if iops is specified, 'standard' if not. Note that this behaviour is different from the AWS web console, where the default is 'gp2'. | string | `"gp2"` | no |
101101
| subnet\_ids | A list of VPC subnet IDs | list(string) | `[]` | no |
102-
| tags | A mapping of tags to assign to security group | map(string) | `{}` | no |
103102
| tags | A mapping of tags to assign to all resources | map(string) | `{}` | no |
103+
| test\_var | This is a test variable | string | `""` | no |
104104
| timeouts | (Optional) Updated Terraform resource management timeouts. Applies to `aws_db_instance` in particular to permit resource management times | map(string) | `{ "create": "40m", "delete": "40m", "update": "80m" }` | no |
105105
| timezone | (Optional) Time zone of the DB instance. timezone is currently only supported by Microsoft SQL Server. The timezone can only be set on creation. See MSSQL User Guide for more information. | string | `""` | no |
106106
| use\_name\_prefix | Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation | bool | `"true"` | no |

‎tests/0.12/main.tf

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ output "environment" {
5252
}
5353

5454

55+
###################################################################################################
56+
#
57+
# Quoted type (https://github.com/antonbabenko/pre-commit-terraform/issues/52)
58+
#
59+
###################################################################################################
60+
variable "test_var" {
61+
type = "string"
62+
description = "This is a test variable"
63+
default = ""
64+
}
65+
66+
5567
###################################################################################################
5668
#
5769
# https://github.com/terraform-aws-modules/terraform-aws-rds: variables.tf
@@ -519,12 +531,6 @@ variable "description" {
519531
default = "Security Group managed by Terraform"
520532
}
521533

522-
variable "tags" {
523-
description = "A mapping of tags to assign to security group"
524-
type = map(string)
525-
default = {}
526-
}
527-
528534
##########
529535
# Ingress
530536
##########

0 commit comments

Comments
 (0)