Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ For more information about the Enterprise Application Service product you can re
## Overview
* [terraform-ibm-enterprise-app-java](#terraform-ibm-enterprise-app-java)
* [Examples](./examples)
* <div style="display: inline-block;"><a href="./examples/basic">Basic example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=eaj-basic-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/tree/main/examples/basic" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
* <div style="display: inline-block;"><a href="./examples/bdr_complete">Build, deploy and run complete example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=eaj-bdr_complete-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/tree/main/examples/bdr_complete" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
* <div style="display: inline-block;"><a href="./examples/dr_complete">Deploy and run complete example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=eaj-dr_complete-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/tree/main/examples/dr_complete" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
:information_source: Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab
* <a href="./examples/basic">Basic example</a> <a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=enterprise-app-java-basic-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/tree/main/examples/basic"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom; margin-left: 5px;"></a>
* <a href="./examples/bdr_complete">Build, deploy and run complete example</a> <a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=enterprise-app-java-bdr_complete-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/tree/main/examples/bdr_complete"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom; margin-left: 5px;"></a>
* <a href="./examples/dr_complete">Deploy and run complete example</a> <a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=enterprise-app-java-dr_complete-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/tree/main/examples/dr_complete"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom; margin-left: 5px;"></a>
* [Contributing](#contributing)
<!-- END OVERVIEW HOOK -->

Expand Down
9 changes: 9 additions & 0 deletions examples/basic/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# Basic example

<!-- BEGIN SCHEMATICS DEPLOY HOOK -->
<a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=enterprise-app-java-basic-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/tree/main/examples/basic"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom;"></a>
<!-- END SCHEMATICS DEPLOY HOOK -->


A simple example that shows how to provision a basic Enterprise Application Service instance with no configuration.

The following resources are provisioned by this example:
- A new resource group, if an existing one is not passed in.
- A new Enterprise Application Service instance in the given resource group on an IBM Cloud account.

<!-- BEGIN SCHEMATICS DEPLOY TIP HOOK -->
:information_source: Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab
<!-- END SCHEMATICS DEPLOY TIP HOOK -->
2 changes: 1 addition & 1 deletion examples/basic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module "resource_group" {
# parsing secret crn to collect the secrets manager ID, the region and the secret ID
module "crn_parser_subid" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.7"
version = "1.4.1"
crn = var.subscription_id_secret_crn
}

Expand Down
9 changes: 9 additions & 0 deletions examples/bdr_complete/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
# Build, deploy and run complete example

<!-- BEGIN SCHEMATICS DEPLOY HOOK -->
<a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=enterprise-app-java-bdr_complete-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/tree/main/examples/bdr_complete"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom;"></a>
<!-- END SCHEMATICS DEPLOY HOOK -->


A Build, deploy and run use-case example to show how to provision an Enterprise Application Service instance by passing application source and configuration repositories as input.
In addiction to the two repositories, the example shows how to include the GitHub token with the right permissions to access the repositories: in the example the token is pulled from an IBM Cloud secrets manager instance where it is stored, by passing the secret CRN which is used to extract the Secrets Manager instance, its region and the secretID to pull the secret value
Note that the three parameters (repositories and token) are mandatory if any of them is not null.

The following resources are provisioned by this example:
- A new resource group, if an existing one is not passed in.
- A new Enterprise Application Service instance in the given resource group on an IBM Cloud account.

<!-- BEGIN SCHEMATICS DEPLOY TIP HOOK -->
:information_source: Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab
<!-- END SCHEMATICS DEPLOY TIP HOOK -->
4 changes: 2 additions & 2 deletions examples/bdr_complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module "resource_group" {
module "crn_parser_token" {
count = var.repos_git_token_secret_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.7"
version = "1.4.1"
crn = var.repos_git_token_secret_crn
}

Expand All @@ -46,7 +46,7 @@ locals {
# parsing secret crn to collect the secrets manager ID, the region and the secret ID
module "crn_parser_subid" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.7"
version = "1.4.1"
crn = var.subscription_id_secret_crn
}

Expand Down
9 changes: 9 additions & 0 deletions examples/dr_complete/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Deploy and run complete example

<!-- BEGIN SCHEMATICS DEPLOY HOOK -->
<a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=enterprise-app-java-dr_complete-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/tree/main/examples/dr_complete"><img src="https://img.shields.io/badge/Deploy%20with IBM%20Cloud%20Schematics-0f62fe?logo=ibm&logoColor=white&labelColor=0f62fe" alt="Deploy with IBM Cloud Schematics" style="height: 16px; vertical-align: text-bottom;"></a>
<!-- END SCHEMATICS DEPLOY HOOK -->


A Deploy and run use-case example to show how to provision an Enterprise Application Service instance by passing an already built maven application through its maven repository URL as source repository and the application configuration through the config repository as input parameters.
The example sets also the var.source_repo_type input variable to "maven" and the "username" and "password" values to a set of fake values for testing purposes
In addiction to the configuration repository, the example shows how to
Expand All @@ -10,3 +15,7 @@ Note that the three parameters, maven and configuration repositories and the git
The following resources are provisioned by this example:
- A new resource group, if an existing one is not passed in.
- A new Enterprise Application Service instance in the given resource group on an IBM Cloud account.

<!-- BEGIN SCHEMATICS DEPLOY TIP HOOK -->
:information_source: Ctrl/Cmd+Click or right-click on the Schematics deploy button to open in a new tab
<!-- END SCHEMATICS DEPLOY TIP HOOK -->
4 changes: 2 additions & 2 deletions examples/dr_complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module "resource_group" {
module "crn_parser_token" {
count = var.repos_git_token_secret_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.7"
version = "1.4.1"
crn = var.repos_git_token_secret_crn
}

Expand All @@ -46,7 +46,7 @@ locals {
# parsing secret crn to collect the secrets manager ID, the region and the secret ID
module "crn_parser_subid" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.7"
version = "1.4.1"
crn = var.subscription_id_secret_crn
}

Expand Down
8 changes: 4 additions & 4 deletions solutions/fully-configurable/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module "resource_group" {
module "crn_parser_token" {
count = var.repos_git_token_secret_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.7"
version = "1.4.1"
crn = var.repos_git_token_secret_crn
}

Expand Down Expand Up @@ -52,7 +52,7 @@ locals {
module "crn_parser_subid" {
count = var.subscription_id_secret_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.7"
version = "1.4.1"
crn = var.subscription_id_secret_crn
}

Expand Down Expand Up @@ -122,7 +122,7 @@ data "ibm_iam_account_settings" "provider_account" {}
module "crn_parser_mq_capacity_instance_crn" {
count = var.mq_capacity_s2s_policy_target_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.7"
version = "1.4.1"
crn = var.mq_capacity_s2s_policy_target_crn
}

Expand Down Expand Up @@ -224,7 +224,7 @@ resource "ibm_iam_authorization_policy" "mq_s2s_policy_account_scope" {
module "crn_parser_db2_instance_crn" {
count = var.db2_s2s_policy_target_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.7"
version = "1.4.1"
crn = var.db2_s2s_policy_target_crn
}

Expand Down
2 changes: 1 addition & 1 deletion solutions/fully-configurable/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.86.1"
version = "1.87.2"
}
time = {
source = "hashicorp/time"
Expand Down
20 changes: 10 additions & 10 deletions tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.25.5
require (
github.com/IBM/go-sdk-core/v5 v5.21.2
github.com/stretchr/testify v1.11.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.65.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.66.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -14,7 +14,7 @@ require (
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
github.com/IBM-Cloud/power-go-client v1.14.4 // indirect
github.com/IBM/cloud-databases-go-sdk v0.8.1 // indirect
github.com/IBM/platform-services-go-sdk v0.92.0 // indirect
github.com/IBM/platform-services-go-sdk v0.93.1 // indirect
github.com/IBM/project-go-sdk v0.4.0 // indirect
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
Expand All @@ -32,7 +32,7 @@ require (
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.6.2 // indirect
github.com/go-git/go-git/v5 v5.16.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
github.com/go-openapi/errors v0.22.6 // indirect
Expand All @@ -51,7 +51,7 @@ require (
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gruntwork-io/terratest v0.54.0 // indirect
github.com/gruntwork-io/terratest v0.55.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter/v2 v2.2.3 // indirect
Expand Down Expand Up @@ -89,13 +89,13 @@ require (
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
golang.org/x/crypto v0.46.0 // indirect
golang.org/x/mod v0.30.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/crypto v0.47.0 // indirect
golang.org/x/mod v0.31.0 // indirect
golang.org/x/net v0.48.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.39.0 // indirect
golang.org/x/text v0.32.0 // indirect
golang.org/x/tools v0.39.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/tools v0.40.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
Expand Down
Loading