Merge branch 'master' into pps-bundle-ga

IBM-Cloud · Oct 18, 2024 · edbde8f · edbde8f
2 parents 2479611 + 7eb2e52
commit edbde8f
Show file tree

Hide file tree

Showing 203 changed files with 15,844 additions and 2,260 deletions.
diff --git a/examples/ibm-configuration-aggregator/main.tf b/examples/ibm-configuration-aggregator/main.tf
@@ -10,7 +10,7 @@ resource "ibm_config_aggregator_settings" "config_aggregator_settings_instance"
   resource_collection_regions                    = var.config_aggregator_settings_regions
 }
 
-data "ibm_config_aggregator_configurations" "config_aggregator_configurations_instance" {
+data "ibm_config_aggregator_configurations" "example" {
   instance_id=var.instance_id
   region =var.region
 

diff --git a/examples/ibm-configuration-aggregator/outputs.tf b/examples/ibm-configuration-aggregator/outputs.tf
@@ -1,5 +1,29 @@
 // This output allows config_aggregator_settings data to be referenced by other resources and the terraform CLI
 // Modify this output if only certain data should be exposed
+locals {
+  entries = [
+    for config in data.ibm_config_aggregator_configurations.example.configs : {
+      about = {
+        account_id               = config.about.account_id
+        config_type              = config.about.config_type
+        last_config_refresh_time  = config.about.last_config_refresh_time
+        location                 = config.about.location
+        resource_crn             = config.about.resource_crn
+        resource_group_id        = config.about.resource_group_id
+        resource_name            = config.about.resource_name
+        service_name             = config.about.service_name
+        tags={}
+      }
+      config = jsondecode(config.config)
+    }
+  ]
+}
+
+output "ibm_config_aggregator_configurations" {
+  value = {
+    configs=local.entries
+  }
+}
 output "config_aggregator_settings" {
   value = {
     additional_scope            = []
@@ -18,10 +42,6 @@ output "aggregator_settings" {
   }
 }
 
-output "ibm_config_aggregator_configurations" {
-  value = data.ibm_config_aggregator_configurations.config_aggregator_configurations_instance
-}
-
 output "config_aggregator_resource_collection_status"{
     value={
       status=data.ibm_config_aggregator_resource_collection_status.config_aggregator_resource_collection_status_instance.status

diff --git a/examples/ibm-configuration-aggregator/variables.tf b/examples/ibm-configuration-aggregator/variables.tf
@@ -17,12 +17,10 @@ variable "instance_id"{
 variable "config_aggregator_settings_resource_collection_enabled" {
   description = "The field denoting if the resource collection is enabled."
   type        = bool
-  default     = true
 }
 variable "config_aggregator_settings_trusted_profile_id" {
   description = "The trusted profile id that provides Reader access to the App Configuration instance to collect resource metadata."
   type        = string
-  default="Profile-2546925a-7b46-40dd-81ff-48015a49ff43"
 }
 variable "config_aggregator_settings_regions" {
   description = "The list of regions across which the resource collection is enabled."

diff --git a/examples/ibm-configuration-aggregator/versions.tf b/examples/ibm-configuration-aggregator/versions.tf
@@ -1,8 +1,8 @@
 terraform {
-  required_version = ">= 1.0"
+required_version = ">=1.0.0, <2.0"
   required_providers {
     ibm = {
-      source  = "terraform.local/ibm-cloud/ibm"
+      source = "registry.terraform.io/ibm-cloud/ibm"
     }
   }
-}
+}
diff --git a/examples/ibm-event-streams/README.md b/examples/ibm-event-streams/README.md
@@ -160,7 +160,34 @@ resource "ibm_resource_tag" "tag_example_on_es" {
 }
 ```
 
-#### Scenario 6: Connect to an existing Event Streams instance and its topics.
+#### Scenario 6: Set default and user quotas on an existing Event Streams instance.
+
+This code sets the default quota to 32768 bytes/second for producers and 16384 bytes/second for consumers.
+It sets a quota for user `iam-ServiceId-00001111-2222-3333-4444-555566667777` to 65536 bytes/second for producers and no limit (-1) for consumers.
+For more information on quotas, see [Setting Kafka quotas](https://cloud.ibm.com/docs/EventStreams?topic=EventStreams-enabling_kafka_quotas).
+
+```terraform
+data "ibm_resource_instance" "es_instance_6" {
+  name              = "terraform-integration-6"
+  resource_group_id = data.ibm_resource_group.group.id
+}
+
+resource "ibm_event_streams_quota" "default_quota" {
+  resource_instance_id = data.ibm_resource_instance.es_instance_6.id
+  entity               = "default"
+  producer_byte_rate   = 32768
+  consumer_byte_rate   = 16384
+}
+
+resource "ibm_event_streams_quota" "user00001111_quota" {
+  resource_instance_id = data.ibm_resource_instance.es_instance_6.id
+  entity               = "iam-ServiceId-00001111-2222-3333-4444-555566667777"
+  producer_byte_rate   = 65536
+  consumer_byte_rate   = -1
+}
+```
+
+#### Scenario 7: Connect to an existing Event Streams instance and its topics.
 
 This scenario uses a fictitious `"kafka_consumer_app"` resource to demonstrate how a consumer application could be configured.
 The resource uses three configuration properties:
@@ -177,22 +204,22 @@ The topic names can be provided as strings, or can be taken from topic data sour
 
 ```terraform
 # Use an existing instance
-data "ibm_resource_instance" "es_instance_6" {
-  name              = "terraform-integration-6"
+data "ibm_resource_instance" "es_instance_7" {
+  name              = "terraform-integration-7"
   resource_group_id = data.ibm_resource_group.group.id
 }
 
 # Use an existing topic on that instance
-data "ibm_event_streams_topic" "es_topic_6" {
-  resource_instance_id = data.ibm_resource_instance.es_instance_6.id
+data "ibm_event_streams_topic" "es_topic_7" {
+  resource_instance_id = data.ibm_resource_instance.es_instance_7.id
   name                 = "my-es-topic"
 }
 
 # The FICTITIOUS consumer application, configured with brokers, API key, and topics
 resource "kafka_consumer_app" "es_kafka_app" {
-  bootstrap_server = lookup(data.ibm_resource_instance.es_instance_4.extensions, "kafka_brokers_sasl", [])
+  bootstrap_server = lookup(data.ibm_resource_instance.es_instance_7.extensions, "kafka_brokers_sasl", [])
   apikey           = var.es_reader_api_key
-  topics           = [data.ibm_event_streams_topic.es_topic_4.name]
+  topics           = [data.ibm_event_streams_topic.es_topic_7.name]
 }
 ```
 

diff --git a/examples/ibm-partner-center-sell/README.md b/examples/ibm-partner-center-sell/README.md
@@ -50,8 +50,8 @@ resource "ibm_onboarding_resource_broker" "onboarding_resource_broker_instance"
 |------|-------------|------|---------|
 | ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
 | env | The environment to fetch this object from. | `string` | false |
-| auth_username | The authentication username to reach the broker. | `string` | true |
-| auth_password | The authentication password to reach the broker. | `string` | true |
+| auth_username | The authentication username to reach the broker. | `string` | false |
+| auth_password | The authentication password to reach the broker. | `string` | false |
 | auth_scheme | The supported authentication scheme for the broker. | `string` | true |
 | resource_group_crn | The cloud resource name of the resource group. | `string` | false |
 | state | The state of the broker. | `string` | false |
@@ -81,9 +81,9 @@ resource "ibm_onboarding_resource_broker" "onboarding_resource_broker_instance"
 
 ```hcl
 resource "ibm_onboarding_catalog_deployment" "onboarding_catalog_deployment_instance" {
-  product_id = var.onboarding_catalog_deployment_product_id
-  catalog_product_id = var.onboarding_catalog_deployment_catalog_product_id
-  catalog_plan_id = var.onboarding_catalog_deployment_catalog_plan_id
+  product_id = ibm_onboarding_product.onboarding_product_instance.id
+  catalog_product_id = ibm_onboarding_catalog_product.onboarding_catalog_product_instance.onboarding_catalog_product_id
+  catalog_plan_id = ibm_onboarding_catalog_plan.onboarding_catalog_plan_instance.onboarding_catalog_plan_id
   env = var.onboarding_catalog_deployment_env
   name = var.onboarding_catalog_deployment_name
   active = var.onboarding_catalog_deployment_active
@@ -125,8 +125,8 @@ resource "ibm_onboarding_catalog_deployment" "onboarding_catalog_deployment_inst
 
 ```hcl
 resource "ibm_onboarding_catalog_plan" "onboarding_catalog_plan_instance" {
-  product_id = var.onboarding_catalog_plan_product_id
-  catalog_product_id = var.onboarding_catalog_plan_catalog_product_id
+  product_id = ibm_onboarding_product.onboarding_product_instance.id
+  catalog_product_id = ibm_onboarding_catalog_product.onboarding_catalog_product_instance.onboarding_catalog_product_id
   env = var.onboarding_catalog_plan_env
   name = var.onboarding_catalog_plan_name
   active = var.onboarding_catalog_plan_active
@@ -167,7 +167,7 @@ resource "ibm_onboarding_catalog_plan" "onboarding_catalog_plan_instance" {
 
 ```hcl
 resource "ibm_onboarding_catalog_product" "onboarding_catalog_product_instance" {
-  product_id = var.onboarding_catalog_product_product_id
+  product_id = ibm_onboarding_product.onboarding_product_instance.id
   env = var.onboarding_catalog_product_env
   name = var.onboarding_catalog_product_name
   active = var.onboarding_catalog_product_active
@@ -209,7 +209,7 @@ resource "ibm_onboarding_catalog_product" "onboarding_catalog_product_instance"
 
 ```hcl
 resource "ibm_onboarding_iam_registration" "onboarding_iam_registration_instance" {
-  product_id = var.onboarding_iam_registration_product_id
+  product_id = ibm_onboarding_product.onboarding_product_instance.id
   env = var.onboarding_iam_registration_env
   name = var.onboarding_iam_registration_name
   enabled = var.onboarding_iam_registration_enabled
@@ -234,7 +234,7 @@ resource "ibm_onboarding_iam_registration" "onboarding_iam_registration_instance
 | ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
 | product_id | The unique ID of the product. | `string` | true |
 | env | The environment to fetch this object from. | `string` | false |
-| name | The IAM registration name, which must be the programmatic name of the product. | `string` | false |
+| name | The IAM registration name, which must be the programmatic name of the product. | `string` | true |
 | enabled | Whether the service is enabled or disabled for IAM. | `bool` | false |
 | service_type | The type of the service. | `string` | false |
 | actions | The product access management action. | `list()` | false |
@@ -285,6 +285,7 @@ resource "ibm_onboarding_product" "onboarding_product_instance" {
 | global_catalog_offering_id | The ID of a global catalog object. |
 | staging_global_catalog_offering_id | The ID of a global catalog object. |
 | approver_resource_id | The ID of the approval workflow of your product. |
+| iam_registration_id | IAM registration identifier. |
 
 ### Resource: ibm_onboarding_registration
 
@@ -313,8 +314,6 @@ resource "ibm_onboarding_registration" "onboarding_registration_instance" {
 
 | Name | Description |
 |------|-------------|
-| account_dra_id | The ID of the IBM Digital Platform Reseller Agreement. |
-| account_dpa_id | The ID of the IBM Digital Provider Agreement. |
 | created_at | The time when the registration was created. |
 | updated_at | The time when the registration was updated. |
 

diff --git a/examples/ibm-partner-center-sell/main.tf b/examples/ibm-partner-center-sell/main.tf
@@ -20,9 +20,9 @@ resource "ibm_onboarding_resource_broker" "onboarding_resource_broker_instance"
 
 // Provision onboarding_catalog_deployment resource instance
 resource "ibm_onboarding_catalog_deployment" "onboarding_catalog_deployment_instance" {
-  product_id = var.onboarding_catalog_deployment_product_id
-  catalog_product_id = var.onboarding_catalog_deployment_catalog_product_id
-  catalog_plan_id = var.onboarding_catalog_deployment_catalog_plan_id
+  product_id = ibm_onboarding_product.onboarding_product_instance.id
+  catalog_product_id = ibm_onboarding_catalog_product.onboarding_catalog_product_instance.onboarding_catalog_product_id
+  catalog_plan_id = ibm_onboarding_catalog_plan.onboarding_catalog_plan_instance.onboarding_catalog_plan_id
   env = var.onboarding_catalog_deployment_env
   name = var.onboarding_catalog_deployment_name
   active = var.onboarding_catalog_deployment_active
@@ -58,26 +58,44 @@ resource "ibm_onboarding_catalog_deployment" "onboarding_catalog_deployment_inst
             type = "image"
             url = "url"
           }
+          embeddable_dashboard = "embeddable_dashboard"
         }
       }
       urls {
         doc_url = "doc_url"
+        apidocs_url = "apidocs_url"
         terms_url = "terms_url"
+        instructions_url = "instructions_url"
+        catalog_details_url = "catalog_details_url"
+        custom_create_page_url = "custom_create_page_url"
+        dashboard = "dashboard"
       }
       hidden = true
       side_by_side_index = 1.0
     }
     service {
       rc_provisionable = true
       iam_compatible = true
+      bindable = true
+      plan_updateable = true
+      service_key_supported = true
+    }
+    deployment {
+      broker {
+        name = "name"
+        guid = "guid"
+      }
+      location = "location"
+      location_url = "location_url"
+      target_crn = "target_crn"
     }
   }
 }
 
 // Provision onboarding_catalog_plan resource instance
 resource "ibm_onboarding_catalog_plan" "onboarding_catalog_plan_instance" {
-  product_id = var.onboarding_catalog_plan_product_id
-  catalog_product_id = var.onboarding_catalog_plan_catalog_product_id
+  product_id = ibm_onboarding_product.onboarding_product_instance.id
+  catalog_product_id = ibm_onboarding_catalog_product.onboarding_catalog_product_instance.onboarding_catalog_product_id
   env = var.onboarding_catalog_plan_env
   name = var.onboarding_catalog_plan_name
   active = var.onboarding_catalog_plan_active
@@ -113,25 +131,42 @@ resource "ibm_onboarding_catalog_plan" "onboarding_catalog_plan_instance" {
             type = "image"
             url = "url"
           }
+          embeddable_dashboard = "embeddable_dashboard"
         }
       }
       urls {
         doc_url = "doc_url"
+        apidocs_url = "apidocs_url"
         terms_url = "terms_url"
+        instructions_url = "instructions_url"
+        catalog_details_url = "catalog_details_url"
+        custom_create_page_url = "custom_create_page_url"
+        dashboard = "dashboard"
       }
       hidden = true
       side_by_side_index = 1.0
     }
+    service {
+      rc_provisionable = true
+      iam_compatible = true
+      bindable = true
+      plan_updateable = true
+      service_key_supported = true
+    }
     pricing {
       type = "free"
       origin = "global_catalog"
     }
+    plan {
+      allow_internal_users = true
+      bindable = true
+    }
   }
 }
 
 // Provision onboarding_catalog_product resource instance
 resource "ibm_onboarding_catalog_product" "onboarding_catalog_product_instance" {
-  product_id = var.onboarding_catalog_product_product_id
+  product_id = ibm_onboarding_product.onboarding_product_instance.id
   env = var.onboarding_catalog_product_env
   name = var.onboarding_catalog_product_name
   active = var.onboarding_catalog_product_active
@@ -170,18 +205,27 @@ resource "ibm_onboarding_catalog_product" "onboarding_catalog_product_instance"
             type = "image"
             url = "url"
           }
+          embeddable_dashboard = "embeddable_dashboard"
         }
       }
       urls {
         doc_url = "doc_url"
+        apidocs_url = "apidocs_url"
         terms_url = "terms_url"
+        instructions_url = "instructions_url"
+        catalog_details_url = "catalog_details_url"
+        custom_create_page_url = "custom_create_page_url"
+        dashboard = "dashboard"
       }
       hidden = true
       side_by_side_index = 1.0
     }
     service {
       rc_provisionable = true
       iam_compatible = true
+      bindable = true
+      plan_updateable = true
+      service_key_supported = true
     }
     other {
       pc {
@@ -223,13 +267,21 @@ resource "ibm_onboarding_catalog_product" "onboarding_catalog_product_instance"
           }
         }
       }
+      composite {
+        composite_kind = "service"
+        composite_tag = "composite_tag"
+        children {
+          kind = "service"
+          name = "name"
+        }
+      }
     }
   }
 }
 
 // Provision onboarding_iam_registration resource instance
 resource "ibm_onboarding_iam_registration" "onboarding_iam_registration_instance" {
-  product_id = var.onboarding_iam_registration_product_id
+  product_id = ibm_onboarding_product.onboarding_product_instance.id
   env = var.onboarding_iam_registration_env
   name = var.onboarding_iam_registration_name
   enabled = var.onboarding_iam_registration_enabled
@@ -408,7 +460,7 @@ resource "ibm_onboarding_iam_registration" "onboarding_iam_registration_instance
       zh_cn = "zh_cn"
     }
     options {
-      access_policy = { "key" = "inner" }
+      access_policy = true
       policy_type = [ "access" ]
       account_type = "enterprise"
     }