Skip to content

Commit ae50250

Browse files
authored
fix: update the DA variable descriptions and diagrams (#582)
1 parent 13330ec commit ae50250

File tree

6 files changed

+44
-44
lines changed

6 files changed

+44
-44
lines changed

reference-architectures/instance.svg

Lines changed: 1 addition & 1 deletion
Loading

reference-architectures/secure-cross-regional-bucket.svg

Lines changed: 1 addition & 1 deletion
Loading

reference-architectures/secure-regional-bucket.svg

Lines changed: 1 addition & 1 deletion
Loading

solutions/instance/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variable "ibmcloud_api_key" {
22
type = string
3-
description = "The IBM Cloud API Token"
3+
description = "The IBM Cloud platform API key to deploy IAM-enabled resources."
44
sensitive = true
55
}
66

solutions/secure-cross-regional-bucket/variables.tf

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variable "ibmcloud_api_key" {
22
type = string
3-
description = "The IBM Cloud API Token"
3+
description = "The IBM Cloud platform API key to deploy IAM-enabled resources."
44
sensitive = true
55
}
66

@@ -17,45 +17,45 @@ variable "kms_region" {
1717
variable "existing_kms_guid" {
1818
type = string
1919
default = null
20-
description = "The GUID of the KMS instance used for the COS bucket root Key. Only required if not supplying an existing KMS root key and if 'skip_iam_authorization_policy' is true."
20+
description = "The GUID of the KMS instance that is used for the Object Storage bucket root key. Required only if a KMS root key is specified and if `skip_iam_authorization_policy` is true."
2121
}
2222

2323
variable "skip_iam_authorization_policy" {
2424
type = bool
25-
description = "Set to true to skip the creation of an IAM authorization policy that permits the COS instance created to read the encryption key from the KMS instance in `existing_kms_guid`. WARNING: An authorization policy must exist before an encrypted bucket can be created"
25+
description = "Set to true to skip the creation of an IAM authorization policy that permits the Object Storage instance created to read the encryption key from the KMS instance in `existing_kms_guid`. WARNING: An authorization policy must exist before an encrypted bucket can be created"
2626
default = false
2727
}
2828

2929
variable "existing_kms_key_crn" {
3030
type = string
3131
default = null
32-
description = "The CRN of an existing KMS key to be used to encrypt the COS bucket. If not supplied, a new key ring and key will be created in the provided KMS instance."
32+
description = "The CRN of an existing KMS key to be used to encrypt the Object Storage bucket. If not supplied, a new key ring and key will be created in the provided KMS instance."
3333
}
3434

3535
variable "kms_endpoint_type" {
3636
type = string
37-
description = "The type of endpoint to be used for communicating with the KMS instance. Allowed values are: 'public' or 'private' (default)"
37+
description = "The type of endpoint to use to communicate with the KMS instance. Allowed values are `public` or `private` (default)."
3838
default = "private"
3939
validation {
4040
condition = can(regex("public|private", var.kms_endpoint_type))
41-
error_message = "The kms_endpoint_type value must be 'public' or 'private'."
41+
error_message = "The value for `kms_endpoint_type` must be `public` or `private`."
4242
}
4343
}
4444

4545
variable "key_ring_name" {
4646
type = string
4747
default = "cross-region-key-ring"
48-
description = "The name to give the Key Ring which will be created for the COS bucket Key. Not used if supplying an existing Key."
48+
description = "The name to give the Key Ring which will be created for the Object Storage bucket Key. Not used if supplying an existing Key."
4949
}
5050

5151
variable "key_name" {
5252
type = string
5353
default = "cross-region-key"
54-
description = "The name to give the Key which will be created for the COS bucket. Not used if supplying an existing Key."
54+
description = "The name to give the Key which will be created for the Object Storage bucket. Not used if supplying an existing Key."
5555
}
5656

5757
########################################################################################################################
58-
# COS variables
58+
# Object Storage variables
5959
########################################################################################################################
6060

6161
variable "existing_cos_instance_id" {
@@ -71,7 +71,7 @@ variable "bucket_access_tags" {
7171

7272
variable "bucket_name" {
7373
type = string
74-
description = "The name to give the newly provisioned COS bucket."
74+
description = "The name to give the newly provisioned Object Storage bucket."
7575
}
7676

7777
variable "management_endpoint_type_for_bucket" {
@@ -87,19 +87,19 @@ variable "cross_region_location" {
8787

8888
variable "bucket_storage_class" {
8989
type = string
90-
description = "the storage class of the newly provisioned COS bucket. Supported values are `standard`, `vault`, `cold`, `smart` and `onerate_active`."
90+
description = "The storage class of the newly provisioned Object Storage bucket. Supported values are `standard`, `vault`, `cold`, `smart` and `onerate_active`."
9191
default = "smart"
9292
}
9393

9494
variable "force_delete" {
9595
type = bool
96-
description = "Deletes all the objects in the COS Bucket before bucket is deleted."
96+
description = "Deletes all the objects in the Object Storage Bucket before bucket is deleted."
9797
default = true
9898
}
9999

100100
variable "add_bucket_name_suffix" {
101101
type = bool
102-
description = "Add random generated suffix (4 characters long) to the newly provisioned COS bucket name (Optional)."
102+
description = "Add random generated suffix (4 characters long) to the newly provisioned Object Storage bucket name (Optional)."
103103
default = false
104104
}
105105

@@ -111,7 +111,7 @@ variable "hard_quota" {
111111

112112
variable "activity_tracker_crn" {
113113
type = string
114-
description = "Activity tracker crn for COS bucket (Optional)"
114+
description = "Activity tracker crn for Object Storage bucket (Optional)"
115115
default = null
116116
}
117117

@@ -123,7 +123,7 @@ variable "expire_days" {
123123

124124
variable "monitoring_crn" {
125125
type = string
126-
description = "IBM Cloud Monitoring crn for COS bucket (Optional)"
126+
description = "IBM Cloud Monitoring crn for Object Storage bucket (Optional)"
127127
default = null
128128
}
129129

@@ -134,31 +134,31 @@ variable "object_versioning_enabled" {
134134
}
135135

136136
variable "retention_enabled" {
137-
description = "Retention enabled for COS bucket. Supported only in `us` location."
137+
description = "Retention enabled for Object Storage bucket. Supported only in `us` location."
138138
type = bool
139139
default = false
140140
}
141141

142142
variable "retention_default" {
143-
description = "Specifies default duration of time an object that can be kept unmodified for COS bucket."
143+
description = "Specifies default duration of time an object that can be kept unmodified for Object Storage bucket."
144144
type = number
145145
default = 90
146146
}
147147

148148
variable "retention_maximum" {
149-
description = "Specifies maximum duration of time an object that can be kept unmodified for COS bucket."
149+
description = "Specifies maximum duration of time an object that can be kept unmodified for Object Storage bucket."
150150
type = number
151151
default = 350
152152
}
153153

154154
variable "retention_minimum" {
155-
description = "Specifies minimum duration of time an object must be kept unmodified for COS bucket."
155+
description = "Specifies minimum duration of time an object must be kept unmodified for Object Storage bucket."
156156
type = number
157157
default = 90
158158
}
159159

160160
variable "retention_permanent" {
161-
description = "Specifies a permanent retention status either enable or disable for COS bucket."
161+
description = "Specifies a permanent retention status either enable or disable for Object Storage bucket."
162162
type = bool
163163
default = false
164164
}

solutions/secure-regional-bucket/variables.tf

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variable "ibmcloud_api_key" {
22
type = string
3-
description = "The IBM Cloud API Token"
3+
description = "The IBM Cloud platform API key to deploy IAM-enabled resources."
44
sensitive = true
55
}
66

@@ -17,45 +17,45 @@ variable "kms_region" {
1717
variable "existing_kms_guid" {
1818
type = string
1919
default = null
20-
description = "The GUID of the KMS instance used for the COS bucket root Key. Only required if not supplying an existing KMS root key and if 'skip_iam_authorization_policy' is true."
20+
description = "The GUID of the KMS instance that is used for the Object Storage bucket root key. Required only if a KMS root key is specified and if `skip_iam_authorization_policy` is true."
2121
}
2222

2323
variable "skip_iam_authorization_policy" {
2424
type = bool
25-
description = "Set to true to skip the creation of an IAM authorization policy that permits the COS instance created to read the encryption key from the KMS instance in `existing_kms_guid`. WARNING: An authorization policy must exist before an encrypted bucket can be created"
25+
description = "Set to true to skip the creation of an IAM authorization policy that permits the Object Storage instance created to read the encryption key from the KMS instance in `existing_kms_guid`. WARNING: An authorization policy must exist before an encrypted bucket can be created"
2626
default = false
2727
}
2828

2929
variable "existing_kms_key_crn" {
3030
type = string
3131
default = null
32-
description = "The CRN of an existing KMS key to be used to encrypt the COS bucket. If not supplied, a new key ring and key will be created in the provided KMS instance."
32+
description = "The CRN of an existing KMS key to be used to encrypt the Object Storage bucket. If not supplied, a new key ring and key will be created in the provided KMS instance."
3333
}
3434

3535
variable "kms_endpoint_type" {
3636
type = string
37-
description = "The type of endpoint to be used for communicating with the KMS instance. Allowed values are: 'public' or 'private' (default)"
37+
description = "The type of endpoint to use to communicate with the KMS instance. Allowed values are `public` or `private` (default)."
3838
default = "private"
3939
validation {
4040
condition = can(regex("public|private", var.kms_endpoint_type))
41-
error_message = "The kms_endpoint_type value must be 'public' or 'private'."
41+
error_message = "The value for `kms_endpoint_type` must be `public` or `private`."
4242
}
4343
}
4444

4545
variable "key_ring_name" {
4646
type = string
4747
default = "cross-region-key-ring"
48-
description = "The name to give the Key Ring which will be created for the COS bucket Key. Not used if supplying an existing Key."
48+
description = "The name to give the Key Ring which will be created for the Object Storage bucket Key. Not used if supplying an existing Key."
4949
}
5050

5151
variable "key_name" {
5252
type = string
5353
default = "cross-region-key"
54-
description = "The name to give the Key which will be created for the COS bucket. Not used if supplying an existing Key."
54+
description = "The name to give the Key which will be created for the Object Storage bucket. Not used if supplying an existing Key."
5555
}
5656

5757
########################################################################################################################
58-
# COS variables
58+
# Object Storage variables
5959
########################################################################################################################
6060

6161
variable "region" {
@@ -66,7 +66,7 @@ variable "region" {
6666

6767
variable "add_bucket_name_suffix" {
6868
type = bool
69-
description = "Add random generated suffix (4 characters long) to the newly provisioned COS bucket name (Optional)."
69+
description = "Add random generated suffix (4 characters long) to the newly provisioned Object Storage bucket name (Optional)."
7070
default = false
7171
}
7272

@@ -83,7 +83,7 @@ variable "bucket_access_tags" {
8383

8484
variable "bucket_name" {
8585
type = string
86-
description = "The name to give the newly provisioned COS bucket. "
86+
description = "The name to give the newly provisioned Object Storage bucket. "
8787
}
8888

8989
variable "management_endpoint_type_for_bucket" {
@@ -94,13 +94,13 @@ variable "management_endpoint_type_for_bucket" {
9494

9595
variable "bucket_storage_class" {
9696
type = string
97-
description = "the storage class of the newly provisioned COS bucket. Supported values are 'standard', 'vault', 'cold', 'smart' and `onerate_active`."
97+
description = "The storage class of the newly provisioned Object Storage bucket. Supported values are `standard`, `vault`, `cold`, `smart` and `onerate_active`."
9898
default = "smart"
9999
}
100100

101101
variable "force_delete" {
102102
type = bool
103-
description = "Deletes all the objects in the COS Bucket before bucket is deleted."
103+
description = "Deletes all the objects in the Object Storage Bucket before bucket is deleted."
104104
default = true
105105
}
106106

@@ -112,7 +112,7 @@ variable "hard_quota" {
112112

113113
variable "activity_tracker_crn" {
114114
type = string
115-
description = "Activity tracker crn for COS bucket (Optional)"
115+
description = "Activity tracker crn for Object Storage bucket (Optional)"
116116
default = null
117117
}
118118

@@ -136,7 +136,7 @@ variable "expire_days" {
136136

137137
variable "monitoring_crn" {
138138
type = string
139-
description = "IBM Cloud Monitoring crn for COS bucket (Optional)"
139+
description = "IBM Cloud Monitoring crn for Object Storage bucket (Optional)"
140140
default = null
141141
}
142142

@@ -147,31 +147,31 @@ variable "object_versioning_enabled" {
147147
}
148148

149149
variable "retention_enabled" {
150-
description = "Retention enabled for COS bucket. "
150+
description = "Retention enabled for Object Storage bucket. "
151151
type = bool
152152
default = false
153153
}
154154

155155
variable "retention_default" {
156-
description = "Specifies default duration of time an object that can be kept unmodified for COS bucket. "
156+
description = "Specifies default duration of time an object that can be kept unmodified for Object Storage bucket. "
157157
type = number
158158
default = 90
159159
}
160160

161161
variable "retention_maximum" {
162-
description = "Specifies maximum duration of time an object that can be kept unmodified for COS bucket. "
162+
description = "Specifies maximum duration of time an object that can be kept unmodified for Object Storage bucket. "
163163
type = number
164164
default = 350
165165
}
166166

167167
variable "retention_minimum" {
168-
description = "Specifies minimum duration of time an object must be kept unmodified for COS bucket. "
168+
description = "Specifies minimum duration of time an object must be kept unmodified for Object Storage bucket. "
169169
type = number
170170
default = 90
171171
}
172172

173173
variable "retention_permanent" {
174-
description = "Specifies a permanent retention status either enable or disable for COS bucket. "
174+
description = "Specifies a permanent retention status either enable or disable for Object Storage bucket. "
175175
type = bool
176176
default = false
177177
}

0 commit comments

Comments
 (0)