Skip to content

Commit cfc2f26

Browse files
authored
fix: archive-type validation error (#41)
* fix: archive-type validation error * fix reference to architecture diagram
1 parent 02f776c commit cfc2f26

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ https://terraform-ibm-modules.github.io/documentation/#/implementation-guideline
4747
-->
4848
## Reference architectures
4949

50-
![cloudability-all-inclusive-onboarding](./reference-architecture/cloudability-all-inclusive-onboarding.svg)
50+
![cloudability-all-inclusive-onboarding](./reference-architectures/cloudability-all-inclusive-onboarding.svg)
5151

5252
<!-- This heading should always match the name of the root level module (aka the repo name) -->
5353
## terraform-ibm-cloudability-onboarding
@@ -127,7 +127,7 @@ statement instead the previous block.
127127
| <a name="input_activity_tracker_read_data_events"></a> [activity\_tracker\_read\_data\_events](#input\_activity\_tracker\_read\_data\_events) | If set to true, all Object Storage bucket read events (i.e. downloads) will be sent to Activity Tracker. | `bool` | `true` | no |
128128
| <a name="input_activity_tracker_write_data_events"></a> [activity\_tracker\_write\_data\_events](#input\_activity\_tracker\_write\_data\_events) | If set to true, all Object Storage bucket read events (i.e. downloads) will be sent to Activity Tracker. | `bool` | `true` | no |
129129
| <a name="input_add_bucket_name_suffix"></a> [add\_bucket\_name\_suffix](#input\_add\_bucket\_name\_suffix) | Add random generated suffix (4 characters long) to the newly provisioned Object Storage bucket name (Optional). | `bool` | `true` | no |
130-
| <a name="input_archive_days"></a> [archive\_days](#input\_archive\_days) | Specifies the number of days when the archive rule action takes effect. This must be set to null when when using var.cross\_region\_location as archive data is not supported with this feature. | `number` | `null` | no |
130+
| <a name="input_archive_days"></a> [archive\_days](#input\_archive\_days) | Specifies the number of days when the archive rule action takes effect. A value of `null` disables archiving. A value of `0` immediately archives uploaded objects to the bucket. | `number` | `null` | no |
131131
| <a name="input_archive_type"></a> [archive\_type](#input\_archive\_type) | Specifies the storage class or archive type to which you want the object to transition. | `string` | `"Glacier"` | no |
132132
| <a name="input_bucket_cbr_rules"></a> [bucket\_cbr\_rules](#input\_bucket\_cbr\_rules) | (Optional, list) List of CBR rules to create for the bucket | <pre>list(object({<br/> description = string<br/> account_id = string<br/> rule_contexts = list(object({<br/> attributes = optional(list(object({<br/> name = string<br/> value = string<br/> }))) }))<br/> enforcement_mode = string<br/> tags = optional(list(object({<br/> name = string<br/> value = string<br/> })), [])<br/> operations = optional(list(object({<br/> api_types = list(object({<br/> api_type_id = string<br/> }))<br/> })))<br/> }))</pre> | `[]` | no |
133133
| <a name="input_bucket_name"></a> [bucket\_name](#input\_bucket\_name) | The name to give the newly provisioned Object Storage bucket. | `string` | `"apptio-cldy-billing-snapshots"` | no |

ibm_catalog.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"diagram": {
100100
"caption": "All inclusive Cloudability Onboarding",
101101
"type": "image/svg+xml",
102-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-cloudability-onboarding/refs/heads/main/reference-architecture/cloudability-all-inclusive-onboarding.svg"
102+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-cloudability-onboarding/refs/heads/main/reference-architectures/cloudability-all-inclusive-onboarding.svg"
103103
},
104104
"description": "Billing reports are written to a Key Protect encrypted object storage bucket. IBM Cloudability is granted access to read from this bucket. Your IBM Cloud account is added to Cloudability so that it knows how to read the data from the object storage bucket."
105105
}
@@ -372,23 +372,23 @@
372372
"key": "archive_days",
373373
"type": "number",
374374
"default_value": "__NULL__",
375-
"description": "Specifies the number of days when the archive rule action takes effect.",
375+
"description": "Specifies the number of days when the archive rule action takes effect. A value of `__NULL__` disables archiving. A value of `0` immediately archives uploaded objects to the bucket.",
376376
"required": false
377377
},
378378
{
379379
"key": "archive_type",
380380
"type": "string",
381-
"default_value": "GLACIER",
381+
"default_value": "Glacier",
382382
"description": "Specifies the storage class or archive type to which you want the object to transition.",
383383
"required": false,
384384
"options": [
385385
{
386-
"displayname": "Glacier",
387-
"value": "GLACIER"
386+
"displayname": "Archive (restore in < 12 hours)",
387+
"value": "Glacier"
388388
},
389389
{
390-
"displayname": "Accelerated",
391-
"value": "ACCELERATED"
390+
"displayname": "Accelerated Archive (restore in < 2 hours)",
391+
"value": "Accelerated"
392392
}
393393
]
394394
},

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ variable "object_versioning_enabled" {
234234
}
235235

236236
variable "archive_days" {
237-
description = "Specifies the number of days when the archive rule action takes effect. This must be set to null when when using var.cross_region_location as archive data is not supported with this feature."
237+
description = "Specifies the number of days when the archive rule action takes effect. A value of `null` disables archiving. A value of `0` immediately archives uploaded objects to the bucket."
238238
type = number
239239
default = null
240240
}

0 commit comments

Comments
 (0)