Skip to content

Commit 33956f3

Browse files
committed
Fix tflint
1 parent ae38dd7 commit 33956f3

File tree

5 files changed

+16
-41
lines changed

5 files changed

+16
-41
lines changed

.tflint.hcl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ config {
22
terraform_version = "0.11.10"
33
deep_check = true
44
ignore_module = {
5+
"devops-workflow/ecs-service/aws" = true
56
}
67
}
78

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ module "" {
2323

2424
| Name | Description | Type | Default | Required |
2525
|------|-------------|:----:|:-----:|:-----:|
26-
| acm\_cert\_domain | Domain name of ACM-managed certificate | string | `*.mgmt.appzen.com` | no |
26+
| acm\_cert\_domain | Domain name of ACM-managed certificate | string | `` | no |
2727
| attributes | Suffix name with additional attributes (policy, role, etc.) | list | `<list>` | no |
28-
| aws\_profile | - | string | `appzen` | no |
28+
| aws\_profile | - | string | `` | no |
2929
| delimiter | Delimiter to be used between `name`, `namespaces`, `attributes`, etc. | string | `-` | no |
3030
| docker\_image | Docker image to use for task | string | `sonatype/nexus3` | no |
3131
| docker\_memory | Hard limit on memory use for task container (default 256) | string | `2048` | no |
3232
| docker\_memory\_reservation | Soft limit on memory use for task container (default 128) | string | `2048` | no |
3333
| ecs\_cluster\_arn | ARN of ECS cluster in which the service will be deployed | string | `` | no |
3434
| ecs\_desired\_count | Desired number of containers in the task (default 1) | string | `1` | no |
3535
| ecs\_security\_group\_id | Security group ID of ECS cluster in which the service will be deployed | string | `` | no |
36-
| environment | Environment (ex: `dev`, `qa`, `stage`, `prod`). (Second or top level namespace. Depending on namespacing options) | string | `MGMT` | no |
36+
| environment | Environment (ex: `dev`, `qa`, `stage`, `prod`). (Second or top level namespace. Depending on namespacing options) | string | `mgmt` | no |
3737
| instance\_type | AWS Instance type, if you change, make sure it is compatible with AMI, not all AMIs allow all instance types | string | `t3.medium` | no |
3838
| key\_name | SSH key name to use | string | `devops-2018-12-04` | no |
3939
| lb\_enable\_http | Enable HTTP listener in LB (http or https MUST be enabled) | string | `true` | no |
@@ -44,8 +44,8 @@ module "" {
4444
| lb\_subnet\_ids | VPC subnet IDs in which to create the LB (unnecessary if neither lb_enable_https or lb_enable_http are true) | list | `<list>` | no |
4545
| mount\_point | Host directory to map as /nexus-data in container | string | `` | no |
4646
| name | Base name for resources | string | `nexus` | no |
47-
| namespace-env | Prefix name with the environment. If true, format is: <env>-<name> | string | `true` | no |
48-
| namespace-org | Prefix name with the organization. If true, format is: <org>-<env namespaced name>. If both env and org namespaces are used, format will be <org>-<env>-<name> | string | `false` | no |
47+
| namespace-env | Prefix name with the environment. If true, format is: {env}-{name} | string | `true` | no |
48+
| namespace-org | Prefix name with the organization. If true, format is: {org}-{env namespaced name}. If both env and org namespaces are used, format will be <org>-<env>-<name> | string | `false` | no |
4949
| organization | Organization name (Top level namespace). | string | `appzen` | no |
5050
| region | - | string | `us-east-1` | no |
5151
| tags | A map of additional tags | map | `<map>` | no |

examples/cluster/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Note that this example may create resources which cost money. Run `terraform des
3333
| key\_name | SSH key name to use | string | `devops-2018-12-04` | no |
3434
| lb\_ingress\_cidr\_blocks | CIDR block to whitelist for the load balancer | list | `<list>` | no |
3535
| name | Base name for resources | string | `nexus` | no |
36-
| namespace-env | Prefix name with the environment. If true, format is: <env>-<name> | string | `true` | no |
37-
| namespace-org | Prefix name with the organization. If true, format is: <org>-<env namespaced name>. If both env and org namespaces are used, format will be <org>-<env>-<name> | string | `false` | no |
36+
| namespace-env | Prefix name with the environment. If true, format is: {env}-{name} | string | `true` | no |
37+
| namespace-org | Prefix name with the organization. If true, format is: {org}-{env namespaced name}. If both env and org namespaces are used, format will be <org>-<env>-<name> | string | `false` | no |
3838
| organization | Organization name (Top level namespace). | string | `example` | no |
3939
| region | - | string | `us-east-1` | no |
4040
| tags | A map of additional tags | map | `<map>` | no |

examples/cluster/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ variable "name" {
2323
}
2424

2525
variable "namespace-env" {
26-
description = "Prefix name with the environment. If true, format is: <env>-<name>"
26+
description = "Prefix name with the environment. If true, format is: {env}-{name}"
2727
default = true
2828
}
2929

3030
variable "namespace-org" {
31-
description = "Prefix name with the organization. If true, format is: <org>-<env namespaced name>. If both env and org namespaces are used, format will be <org>-<env>-<name>"
31+
description = "Prefix name with the organization. If true, format is: {org}-{env namespaced name}. If both env and org namespaces are used, format will be <org>-<env>-<name>"
3232
default = false
3333
}
3434

variables.tf

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ variable "delimiter" {
1414

1515
variable "environment" {
1616
description = "Environment (ex: `dev`, `qa`, `stage`, `prod`). (Second or top level namespace. Depending on namespacing options)"
17-
default = "MGMT"
17+
default = "mgmt"
1818
}
1919

2020
variable "name" {
@@ -23,12 +23,12 @@ variable "name" {
2323
}
2424

2525
variable "namespace-env" {
26-
description = "Prefix name with the environment. If true, format is: <env>-<name>"
26+
description = "Prefix name with the environment. If true, format is: {env}-{name}"
2727
default = true
2828
}
2929

3030
variable "namespace-org" {
31-
description = "Prefix name with the organization. If true, format is: <org>-<env namespaced name>. If both env and org namespaces are used, format will be <org>-<env>-<name>"
31+
description = "Prefix name with the organization. If true, format is: {org}-{env namespaced name}. If both env and org namespaces are used, format will be <org>-<env>-<name>"
3232
default = false
3333
}
3434

@@ -49,11 +49,11 @@ variable "tags" {
4949
variable "acm_cert_domain" {
5050
description = "Domain name of ACM-managed certificate"
5151
type = "string"
52-
default = "*.mgmt.appzen.com"
52+
default = ""
5353
}
5454

5555
variable "aws_profile" {
56-
default = "appzen"
56+
default = ""
5757
}
5858

5959
variable "docker_image" {
@@ -122,33 +122,7 @@ variable "lb_internal" {
122122
variable "lb_ingress_cidr_blocks" {
123123
description = "CIDR block to whitelist for the load balancer"
124124
type = "list"
125-
126-
default = [
127-
# Appzen offices
128-
"12.51.198.242/32", # "0.0.0.0/0",
129-
130-
"184.183.7.98/32",
131-
132-
# Bitbucket
133-
# "104.192.136.0/21","34.198.203.127","34.198.32.85",
134-
# Bitbucket Pipeline build environments
135-
"34.199.54.113/32",
136-
137-
"34.232.25.90/32",
138-
"34.232.119.183/32",
139-
"34.236.25.177/32",
140-
"35.171.175.212/32",
141-
"52.54.90.98/32",
142-
"52.202.195.162/32",
143-
"52.203.14.55/32",
144-
"52.204.96.37/32",
145-
"34.218.156.209/32",
146-
"34.218.168.212/32",
147-
"52.41.219.63/32",
148-
"35.155.178.254/32",
149-
"35.160.177.10/32",
150-
"34.216.18.129/32",
151-
]
125+
default = ["0.0.0.0/0"]
152126
}
153127

154128
variable "lb_subnet_ids" {

0 commit comments

Comments
 (0)