Skip to content

Commit fc342b1

Browse files
committed
Replace "" default values with nulls
1 parent 05fb427 commit fc342b1

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ BACKWARDS INCOMPATIBILITIES / NOTES:
1111
`true|false`.
1212
* The `allowed_cidrs` variable has been renamed to `default_ingress_cidrs`.
1313
* The `egress_cidrs` variable has been renamed to `default_egress_cidrs`.
14+
* The `cluster_instance_amis` variable has been replaced with the singular
15+
`cluster_instance_ami`, with default value of `null`.
16+
* The following variables have had their default value replaced from `""` to
17+
`null`:
18+
- `cluster_instance_user_data_template`
19+
- `cluster_instance_iam_policy_contents`
20+
- `cluster_service_iam_policy_contents`
1421

1522
IMPROVEMENTS:
1623

config/defaults.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ custom_ami_id: "ami-3fb6bc5b"
2222
cluster_name: 'test-cluster'
2323
cluster_instance_ssh_public_key_path: "%{hiera('project_directory')}/config/secrets/cluster/ssh.public"
2424
cluster_instance_type: 't2.medium'
25-
cluster_instance_ami: "''"
2625
cluster_instance_root_block_device_size: 40
2726
cluster_instance_root_block_device_path: '/dev/xvda'
2827

variables.tf

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ variable "cluster_instance_ssh_public_key_path" {
3737
description = "The path to the public key to use for the container instances."
3838
type = string
3939
default = null
40-
nullable = true
4140
}
4241

4342
variable "cluster_instance_root_block_device_size" {
@@ -63,29 +62,24 @@ variable "cluster_instance_root_block_device_path" {
6362
variable "cluster_instance_user_data_template" {
6463
description = "The contents of a template for container instance user data."
6564
type = string
66-
default = ""
67-
nullable = false
65+
default = null
6866
}
6967

7068
variable "cluster_instance_ami" {
7169
description = "AMI for the container instances."
7270
type = string
73-
74-
default = ""
75-
nullable = false
71+
default = null
7672
}
7773

7874
variable "cluster_instance_iam_policy_contents" {
7975
description = "The contents of the cluster instance IAM policy."
8076
type = string
81-
default = ""
82-
nullable = false
77+
default = null
8378
}
8479
variable "cluster_service_iam_policy_contents" {
8580
description = "The contents of the cluster service IAM policy."
8681
type = string
87-
default = ""
88-
nullable = false
82+
default = null
8983
}
9084

9185
variable "cluster_minimum_size" {

0 commit comments

Comments
 (0)