Merge branch 'main' into feat/50-bucket-cbr

README.md

@@ -96,7 +96,7 @@ statement instead the previous block.
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.3.0 |
 | <a name="requirement_cloudability"></a> [cloudability](#requirement\_cloudability) | 0.0.40 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.71.3 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.73.0 |
 | <a name="requirement_restapi"></a> [restapi](#requirement\_restapi) | 1.20.0 |
 
 ### Modules
@@ -120,9 +120,9 @@ statement instead the previous block.
 
 | Name | Type |
 |------|------|
-| [ibm_enterprises.enterprises](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.3/docs/data-sources/enterprises) | data source |
-| [ibm_iam_account_settings.billing_exports_account](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.3/docs/data-sources/iam_account_settings) | data source |
-| [ibm_iam_auth_token.tokendata](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.71.3/docs/data-sources/iam_auth_token) | data source |
+| [ibm_enterprises.enterprises](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.73.0/docs/data-sources/enterprises) | data source |
+| [ibm_iam_account_settings.billing_exports_account](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.73.0/docs/data-sources/iam_account_settings) | data source |
+| [ibm_iam_auth_token.tokendata](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.73.0/docs/data-sources/iam_auth_token) | data source |
 
 ### Inputs
 

ibm_catalog.json

@@ -430,7 +430,7 @@
 						{
 							"key": "management_endpoint_type_for_bucket",
 							"description": "The type of endpoint for the IBM terraform provider to use to manage the bucket. (public, private, or direct)",
-							"type": "boolean",
+							"type": "string",
 							"hidden": true,
 							"default_value": "private",
 							"options": [
@@ -627,7 +627,7 @@
 						{
 							"key": "kms_endpoint_type",
 							"description": "The type of endpoint to be used for management of key protect.",
-							"type": "boolean",
+							"type": "string",
 							"hidden": true,
 							"default_value": "private",
 							"options": [

modules/encrypted_cos_bucket/README.md

@@ -71,8 +71,8 @@ statement instead the previous block.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_cos_bucket"></a> [cos\_bucket](#module\_cos\_bucket) | terraform-ibm-modules/cos/ibm | 8.15.2 |
-| <a name="module_key_protect_all_inclusive"></a> [key\_protect\_all\_inclusive](#module\_key\_protect\_all\_inclusive) | terraform-ibm-modules/kms-all-inclusive/ibm | 4.17.0 |
+| <a name="module_cos_bucket"></a> [cos\_bucket](#module\_cos\_bucket) | terraform-ibm-modules/cos/ibm | 8.15.13 |
+| <a name="module_key_protect_all_inclusive"></a> [key\_protect\_all\_inclusive](#module\_key\_protect\_all\_inclusive) | terraform-ibm-modules/kms-all-inclusive/ibm | 4.18.2 |
 | <a name="module_key_protect_key_cbr_rule"></a> [key\_protect\_key\_cbr\_rule](#module\_key\_protect\_key\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.29.0 |
 
 ### Resources

modules/encrypted_cos_bucket/main.tf

@@ -40,7 +40,7 @@ module "key_protect_all_inclusive" {
   }
   count                       = local.key_management_enabled ? 1 : 0
   source                      = "terraform-ibm-modules/kms-all-inclusive/ibm"
-  version                     = "4.17.0"
+  version                     = "4.18.2"
   create_key_protect_instance = var.create_key_protect_instance
   key_protect_instance_name   = var.key_protect_instance_name
   resource_group_id           = var.resource_group_id
@@ -130,7 +130,7 @@ module "cos_bucket" {
     ibm = ibm
   }
   source                              = "terraform-ibm-modules/cos/ibm"
-  version                             = "8.15.2"
+  version                             = "8.15.13"
   bucket_name                         = var.bucket_name
   add_bucket_name_suffix              = var.add_bucket_name_suffix
   management_endpoint_type_for_bucket = var.management_endpoint_type_for_bucket

reference-architectures/cloudability-enablement.md

@@ -52,7 +52,7 @@ content-type: reference-architecture
 
 # Set production to true to publish the reference architecture to IBM Cloud docs.
 
-production: false
+production: true
 
 ---
 
@@ -94,7 +94,7 @@ After the introduction, include a summary of the typical use case for the archit
 ## Architecture diagram
 {: #architecture-diagram}
 
-![Architecture diagram for the Cloudability Enablement deployable architecture](cloudability-all-inclusive-onboarding.svg "Architecture diagram for the Cloudability Enablement deployable architecture") {: caption="Figure 1. Cloudability Enablement deployable architecture" caption-side="bottom"}{: external download="cloudability-all-inclusive-onboarding.svg"}
+![Architecture diagram for the Cloudability Enablement deployable architecture](cloudability-all-inclusive-onboarding.svg "Architecture diagram for the Cloudability Enablement deployable architecture") {: caption="Cloudability Enablement deployable architecture" caption-side="bottom"}{: external download="cloudability-all-inclusive-onboarding.svg"}
 
 The Cloudability Enablement deployable architecture creates an instance of {{site.data.keyword.cos_full_notm}} in a target {{site.data.keyword.Bluemix_notm}} account, resource group, and region. An IBM Key Protect instance is created in this same resource group and region to provide a [custom encryption key](/docs/key-protect?topic=key-protect-integrate-cos). Then, it configures [billing reports](/docs/account?topic=account-exporting-your-usage&interface=ui#enable-export-usage) to be written to the Object Storage bucket. Cloudability is granted access by the DA to read the billing reports within the bucket. Next, the {{site.data.keyword.Bluemix_notm}} account is added to Cloudability so that it is made aware of how to pull the data from Object Storage bucker. Events are sent to Monitoring and Activity Tracker by default to help track changes that are made to the Object Storage bucket.
 
@@ -107,7 +107,7 @@ An account can enable billing report exports for a single account.
 ## Design concepts
 {: #design-concepts}
 
-![Design requirements for Cloudability Enablement deployable architecture](heat-map.svg "Design requirements"){: caption="Figure 2. Scope of the design requirements" caption-side="bottom"}
+![Design requirements for Cloudability Enablement deployable architecture](heat-map.svg "Design requirements"){: caption="Scope of the design requirements" caption-side="bottom"}
 
 
 ## Requirements
@@ -122,7 +122,7 @@ The following table outlines the requirements that are addressed in this archite
 | Security           | * Encrypt all application data in transit and at rest to protect it from unauthorized disclosure. \n * Encrypt all security data (operational and audit logs) to protect from unauthorized disclosure. \n * Protect secrets through their entire lifecycle and secure them using access control measures. \n * Restrict access to data to only allowed members with the minimal required access. |
 | Resiliency         | * Ensure availability of the services in the event of planned and unplanned outages |
 | Service Management | Monitor audit logs to track changes and detect potential security problems. |
-{: caption="Table 1. Requirements" caption-side="bottom"}
+{: caption="Requirements" caption-side="bottom"}
 
 ## Components
 {: #components}
@@ -138,7 +138,7 @@ The following table outlines the services that are used in the architecture for
 | Resiliency | Key Protect | Support the selection of [{{site.data.keyword.keymanagementserviceshort}} failover regions](/docs/key-protect?topic=key-protect-ha-dr#availability) if needed. |
 | Service Management | IBM Cloud Monitoring | Operational monitoring of your Object Storage bucket is enabled by default. |
 |  | Activity Tracker Event Routing | Object Storage operational logs are enabled by default. |
-{: caption="Table 2. Components" caption-side="bottom"}
+{: caption="Components" caption-side="bottom"}
 
 <!-- ## Compliance
 {: #compliance}