Skip to content

feat : Added Event Streams DA (Quickstart and Security-Enforced Variation) #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 49 commits into from
Jun 23, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
431986d
add : fully configurable version
May 5, 2025
3ac6a6f
updated json and DA
May 5, 2025
0bb63c1
updated json
May 7, 2025
5b66874
updated json
May 7, 2025
05e774d
added security and standard DA
May 12, 2025
1337681
Merge branch 'main' into issue_13014
May 12, 2025
f81428f
added security and standard DA
May 12, 2025
1028852
updated PR
May 14, 2025
9b69d3a
updated PR
May 14, 2025
84e265f
fix conflict
May 14, 2025
6811dc4
fix pipeline
May 14, 2025
b81e550
fix ref_arch
May 14, 2025
c50fcda
SKIP UPGRADE TEST
May 14, 2025
c9d3c8e
update catalog.json
May 14, 2025
059c16f
fix ibm_catalog
May 14, 2025
ffc76d5
update endpoint
May 14, 2025
d86f7f6
updated output
May 15, 2025
06c6090
updated account infra dependency
May 15, 2025
008faf1
Merge branch 'main' into issue_13014
May 19, 2025
73eea2c
fix pre-commit
May 19, 2025
bd2d28e
fix json
May 22, 2025
a891041
Merge branch 'main' into issue_13014
May 27, 2025
fe695f1
updated variation name
May 29, 2025
f6d357c
Update solutions/quickstart/variables.tf
Khuzaima05 Jun 11, 2025
4573a54
Update solutions/security-enforced/catalogValidationValues.json.template
Khuzaima05 Jun 11, 2025
918c2e6
Update cra-config.yaml
Khuzaima05 Jun 11, 2025
4ae7a1a
Update cra-config.yaml
Khuzaima05 Jun 11, 2025
e91293f
Update ibm_catalog.json
Khuzaima05 Jun 11, 2025
c11cc2f
Update ibm_catalog.json
Khuzaima05 Jun 11, 2025
8971ad1
Update ibm_catalog.json
Khuzaima05 Jun 11, 2025
d722813
Update solutions/quickstart/variables.tf
Khuzaima05 Jun 11, 2025
ff0d8f8
Update ibm_catalog.json
Khuzaima05 Jun 11, 2025
88f221b
Update solutions/security-enforced/variables.tf
Khuzaima05 Jun 11, 2025
c55b841
Update solutions/security-enforced/variables.tf
Khuzaima05 Jun 11, 2025
1bec048
Update solutions/security-enforced/variables.tf
Khuzaima05 Jun 11, 2025
59b290a
Update solutions/quickstart/catalogValidationValues.json.template
Khuzaima05 Jun 11, 2025
eef1eb0
Update solutions/quickstart/variables.tf
Khuzaima05 Jun 11, 2025
11546e3
Update solutions/quickstart/variables.tf
Khuzaima05 Jun 11, 2025
8f90a56
resolve review comments
Jun 12, 2025
633d240
updated PR for improving User experience
Jun 12, 2025
bae20f2
minor updates
Ak-sky Jun 16, 2025
3858cb2
added observability add-ons
Jun 17, 2025
0cc5023
add-on version update
Jun 17, 2025
e8d75c3
Merge branch 'main' into issue_13014
Jun 18, 2025
a6e9b53
resolve conflict
Jun 18, 2025
b0351f4
resolve review comments
Jun 18, 2025
bc11862
fix minor issues
Jun 19, 2025
4a96e05
resolve review comments
Jun 19, 2025
bb45caf
minor update
Jun 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updated output
  • Loading branch information
Khuzaima-Shakeel authored and Khuzaima-Shakeel committed May 15, 2025
commit d86f7f659b3243e699fe2999ea97ad92098c821a
12 changes: 6 additions & 6 deletions solutions/security-enforced/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This solution supports provisioning and configuring the following infrastructure
- Schemas to apply to resources.
- Mirroring of existing event stream instace.

![da-enterprise](../../reference-architecture/deployable-architecture-event-streams-security-enforced.svg)
![event-streams-security-enforced-deployable-architecture](../../reference-architecture/deployable-architecture-event-streams-security-enforced.svg)

**Important:** Because this solution contains a provider configuration and is not compatible with the `for_each`, `count`, and `depends_on` arguments, do not call this solution from one or more other modules. For more information about how resources are associated with provider configurations with multiple modules, see [Providers Within Modules](https://developer.hashicorp.com/terraform/language/modules/develop/providers).

Expand Down Expand Up @@ -88,14 +88,14 @@ This solution supports provisioning and configuring the following infrastructure

| Name | Description |
|------|-------------|
| <a name="output_crn"></a> [crn](#output\_crn) | Event Streams instance crn |
| <a name="output_guid"></a> [guid](#output\_guid) | Event Streams instance guid |
| <a name="output_id"></a> [id](#output\_id) | Event Streams instance id |
| <a name="output_event_streams_crn"></a> [event\_streams\_crn](#output\_event\_streams\_crn) | Event Streams instance crn |
| <a name="output_event_streams_guid"></a> [event\_streams\_guid](#output\_event\_streams\_guid) | Event Streams instance guid |
| <a name="output_event_streams_id"></a> [event\_streams\_id](#output\_event\_streams\_id) | Event Streams instance id |
| <a name="output_event_streams_mirroring_config_id"></a> [event\_streams\_mirroring\_config\_id](#output\_event\_streams\_mirroring\_config\_id) | The ID of the mirroring config in CRN format |
| <a name="output_event_streams_mirroring_topic_patterns"></a> [event\_streams\_mirroring\_topic\_patterns](#output\_event\_streams\_mirroring\_topic\_patterns) | Mirroring topic patterns |
| <a name="output_kafka_broker_version"></a> [kafka\_broker\_version](#output\_kafka\_broker\_version) | The Kafka version |
| <a name="output_kafka_brokers_sasl"></a> [kafka\_brokers\_sasl](#output\_kafka\_brokers\_sasl) | (Array of Strings) Kafka brokers use for interacting with Kafka native API |
| <a name="output_kafka_http_url"></a> [kafka\_http\_url](#output\_kafka\_http\_url) | The API endpoint to interact with Event Streams REST API |
| <a name="output_mirroring_config_id"></a> [mirroring\_config\_id](#output\_mirroring\_config\_id) | The ID of the mirroring config in CRN format |
| <a name="output_mirroring_topic_patterns"></a> [mirroring\_topic\_patterns](#output\_mirroring\_topic\_patterns) | Mirroring topic patterns |
| <a name="output_resource_group_id"></a> [resource\_group\_id](#output\_resource\_group\_id) | Resource group ID |
| <a name="output_resource_group_name"></a> [resource\_group\_name](#output\_resource\_group\_name) | Resource group name |
| <a name="output_service_credential_secret_groups"></a> [service\_credential\_secret\_groups](#output\_service\_credential\_secret\_groups) | Service credential secret groups |
Expand Down
1 change: 0 additions & 1 deletion solutions/security-enforced/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ locals {
kms_key_name = "${local.prefix}${var.kms_key_name}"
kms_region = var.existing_kms_instance_crn != null ? module.kms_instance_crn_parser[0].region : null


create_cross_account_auth_policy = !var.skip_event_streams_kms_auth_policy && var.ibmcloud_kms_api_key != null

kms_service_name = var.existing_event_streams_kms_key_crn != null ? module.kms_key_crn_parser[0].service_name : (var.existing_kms_instance_crn != null ? module.kms_instance_crn_parser[0].service_name : null)
Expand Down
10 changes: 5 additions & 5 deletions solutions/security-enforced/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ output "resource_group_id" {
value = module.resource_group.resource_group_id
}

output "crn" {
output "event_streams_crn" {
description = "Event Streams instance crn"
value = module.event_streams.crn
}

output "id" {
output "event_streams_id" {
description = "Event Streams instance id"
value = module.event_streams.id
}

output "guid" {
output "event_streams_guid" {
description = "Event Streams instance guid"
value = module.event_streams.guid
}
Expand Down Expand Up @@ -63,12 +63,12 @@ output "service_credential_secret_groups" {
value = length(local.service_credential_secrets) > 0 ? module.secrets_manager_service_credentials[0].secret_groups : null
}

output "mirroring_config_id" {
output "event_streams_mirroring_config_id" {
description = "The ID of the mirroring config in CRN format"
value = module.event_streams.mirroring_config_id
}

output "mirroring_topic_patterns" {
output "event_streams_mirroring_topic_patterns" {
description = "Mirroring topic patterns"
value = module.event_streams.mirroring_topic_patterns
}
6 changes: 3 additions & 3 deletions solutions/standard/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ This solution supports provisioning and configuring the following infrastructure

| Name | Description |
|------|-------------|
| <a name="output_crn"></a> [crn](#output\_crn) | Event Streams instance crn |
| <a name="output_guid"></a> [guid](#output\_guid) | Event Streams instance guid |
| <a name="output_id"></a> [id](#output\_id) | Event Streams instance id |
| <a name="output_event_streams_crn"></a> [event\_streams\_crn](#output\_event\_streams\_crn) | Event Streams instance crn |
| <a name="output_event_streams_guid"></a> [event\_streams\_guid](#output\_event\_streams\_guid) | Event Streams instance guid |
| <a name="output_event_streams_id"></a> [event\_streams\_id](#output\_event\_streams\_id) | Event Streams instance id |
| <a name="output_kafka_broker_version"></a> [kafka\_broker\_version](#output\_kafka\_broker\_version) | The Kafka version |
| <a name="output_kafka_brokers_sasl"></a> [kafka\_brokers\_sasl](#output\_kafka\_brokers\_sasl) | (Array of Strings) Kafka brokers use for interacting with Kafka native API |
| <a name="output_kafka_http_url"></a> [kafka\_http\_url](#output\_kafka\_http\_url) | The API endpoint to interact with Event Streams REST API |
Expand Down
6 changes: 3 additions & 3 deletions solutions/standard/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ output "resource_group_id" {
value = module.resource_group.resource_group_id
}

output "crn" {
output "event_streams_crn" {
description = "Event Streams instance crn"
value = module.event_streams.crn
}

output "id" {
output "event_streams_id" {
description = "Event Streams instance id"
value = module.event_streams.id
}

output "guid" {
output "event_streams_guid" {
description = "Event Streams instance guid"
value = module.event_streams.guid
}
Expand Down