Skip to content

Commit 3129d0b

Browse files
vbontempivbontempi
committed
chore: aligned main
2 parents fcced5f + 2d4e2c0 commit 3129d0b

File tree

6 files changed

+109
-98
lines changed

6 files changed

+109
-98
lines changed

‎common-dev-assets

‎ibm_catalog.json

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
"description": "Supports deploying an instance of Enterprise Application Service for Java on cloud together with optional security and observability cloud services"
7474
},
7575
{
76-
"title": "Supports creating Service To Service authorisation policy towards a MQ instance",
77-
"description": "Supports creating Service To Service authorisation policy towards a MQ instance to allow the Java application running in Enterprise Application Service for Java instance to connect to this"
76+
"title": "Supports Service To Service authorisation policy creation to a MQ and DB2 instances",
77+
"description": "Supports Service To Service authorisation policy creation to a MQ and DB2 instances to allow the Enterprise Application Service for Java to connect to them"
7878
}
7979
],
8080
"diagrams": [
@@ -84,54 +84,56 @@
8484
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-ease/main/reference-architecture/deployable-architecture-ease.svg",
8585
"type": "image/svg+xml"
8686
},
87-
"description": "This architecture supports deploying an instance of Enterprise Application Service for Java on cloud together with optional security and observability cloud services"
87+
"description": "This architecture supports creating and configuring Enterprise Application Service for Java resources"
8888
}
8989
]
9090
},
9191
"dependencies": [
9292
{
93-
"name": "testing-deploy-arch-ibm-secrets-manager",
94-
"id": "5f149ae6-d781-460a-977d-c8c4171ad0fa-global",
93+
"name": "deploy-arch-ibm-secrets-manager",
94+
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
9595
"flavors": [
96-
"standard"
96+
"fully-configurable"
9797
],
9898
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
99-
"version": "^1.2.2",
99+
"version": "^v2.4.0",
100100
"optional": true,
101101
"on_by_default": true,
102-
"default_flavor": "standard",
102+
"default_flavor": "fully-configurable",
103103
"input_mapping": [
104-
{
105-
"reference_version": true,
106-
"dependency_input": "region",
107-
"version_input": "region"
108-
},
109104
{
110105
"reference_version": true,
111106
"dependency_input": "prefix",
112107
"version_input": "prefix"
108+
},
109+
{
110+
"dependency_output": "secrets_manager_crn",
111+
"version_input": "existing_secrets_manager_crn"
112+
},
113+
{
114+
"value": "us-south",
115+
"dependency_input": "region"
113116
}
114117
],
115118
"ignore_auto_referencing": [
116119
"*"
117120
]
118121
},
119122
{
120-
"name": "testing-deploy-arch-ibm-observability",
121-
"id": "daf2cf91-2384-4205-b7f4-621299a4896d-global",
123+
"name": "deploy-arch-ibm-observability",
124+
"id": "a3137d28-79e0-479d-8a24-758ebd5a0eab-global",
122125
"flavors": [
123-
"standard"
126+
"instances"
124127
],
125128
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
126129
"optional": true,
127-
"version": "^1.3.3",
130+
"version": "^v3.0.3",
128131
"on_by_default": true,
129-
"default_flavor": "standard",
132+
"default_flavor": "instances",
130133
"input_mapping": [
131134
{
132-
"reference_version": true,
133-
"dependency_input": "region",
134-
"version_input": "region"
135+
"value": "us-south",
136+
"dependency_input": "region"
135137
},
136138
{
137139
"reference_version": true,
@@ -149,17 +151,17 @@
149151
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
150152
"optional": true,
151153
"on_by_default": true,
152-
"default_flavor": "standard",
153-
"version": "^v1.19.1",
154+
"default_flavor": "resource-group-only",
155+
"version": "^v3.0.7",
154156
"input_mapping": [
155157
{
156158
"reference_version": true,
157159
"dependency_input": "prefix",
158160
"version_input": "prefix"
159161
},
160162
{
161-
"dependency_input": "skip_iam_account_settings",
162-
"value": true
163+
"dependency_input": "provision_trusted_profile_projects",
164+
"value": false
163165
},
164166
{
165167
"dependency_output": "workload_resource_group_name",
@@ -297,16 +299,17 @@
297299
"identifier": "rg_name"
298300
}
299301
}
300-
},{
302+
},
303+
{
301304
"key": "resource_tags",
302305
"type": "string",
303306
"custom_config": {
304-
"type": "array",
305-
"grouping": "deployment",
306-
"original_grouping": "deployment",
307-
"config_constraints": {
308-
"type": "string"
309-
}
307+
"type": "array",
308+
"grouping": "deployment",
309+
"original_grouping": "deployment",
310+
"config_constraints": {
311+
"type": "string"
312+
}
310313
}
311314
},
312315
{
@@ -353,12 +356,12 @@
353356
"key": "mq_s2s_policy_roles",
354357
"type": "string",
355358
"custom_config": {
356-
"type": "array",
357-
"grouping": "deployment",
358-
"original_grouping": "deployment",
359-
"config_constraints": {
360-
"type": "string"
361-
}
359+
"type": "array",
360+
"grouping": "deployment",
361+
"original_grouping": "deployment",
362+
"config_constraints": {
363+
"type": "string"
364+
}
362365
}
363366
},
364367
{
@@ -371,12 +374,12 @@
371374
"key": "db2_s2s_policy_roles",
372375
"type": "string",
373376
"custom_config": {
374-
"type": "array",
375-
"grouping": "deployment",
376-
"original_grouping": "deployment",
377-
"config_constraints": {
378-
"type": "string"
379-
}
377+
"type": "array",
378+
"grouping": "deployment",
379+
"original_grouping": "deployment",
380+
"config_constraints": {
381+
"type": "string"
382+
}
380383
}
381384
},
382385
{

‎solutions/fully-configurable/version.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ terraform {
33
required_providers {
44
ibm = {
55
source = "IBM-Cloud/ibm"
6-
version = "1.77.1"
6+
version = "1.78.3"
77
}
88
time = {
99
source = "hashicorp/time"
10-
version = "0.13.0"
10+
version = "0.13.1"
1111
}
1212
}
1313
}

‎tests/go.mod

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ module github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java
22

33
go 1.23.0
44

5-
toolchain go1.24.1
5+
toolchain go1.24.3
66

77
require (
88
github.com/stretchr/testify v1.10.0
9-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.47.1
9+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.51.1
1010
gopkg.in/yaml.v3 v3.0.1
1111
)
1212

@@ -15,26 +15,26 @@ require (
1515
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
1616
github.com/IBM-Cloud/power-go-client v1.11.0 // indirect
1717
github.com/IBM/cloud-databases-go-sdk v0.7.1 // indirect
18-
github.com/IBM/go-sdk-core/v5 v5.19.0 // indirect
19-
github.com/IBM/platform-services-go-sdk v0.79.0 // indirect
18+
github.com/IBM/go-sdk-core/v5 v5.19.1 // indirect
19+
github.com/IBM/platform-services-go-sdk v0.82.0 // indirect
2020
github.com/IBM/project-go-sdk v0.3.6 // indirect
2121
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
2222
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
2323
github.com/Microsoft/go-winio v0.6.2 // indirect
24-
github.com/ProtonMail/go-crypto v1.1.5 // indirect
24+
github.com/ProtonMail/go-crypto v1.1.6 // indirect
2525
github.com/agext/levenshtein v1.2.3 // indirect
2626
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
2727
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2828
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
29-
github.com/cloudflare/circl v1.6.0 // indirect
29+
github.com/cloudflare/circl v1.6.1 // indirect
3030
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
3131
github.com/davecgh/go-spew v1.1.1 // indirect
3232
github.com/emirpasic/gods v1.18.1 // indirect
3333
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
3434
github.com/ghodss/yaml v1.0.0 // indirect
3535
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
3636
github.com/go-git/go-billy/v5 v5.6.2 // indirect
37-
github.com/go-git/go-git/v5 v5.14.0 // indirect
37+
github.com/go-git/go-git/v5 v5.16.0 // indirect
3838
github.com/go-logr/logr v1.4.2 // indirect
3939
github.com/go-logr/stdr v1.2.2 // indirect
4040
github.com/go-openapi/analysis v0.21.5 // indirect
@@ -49,11 +49,11 @@ require (
4949
github.com/go-openapi/validate v0.22.4 // indirect
5050
github.com/go-playground/locales v0.14.1 // indirect
5151
github.com/go-playground/universal-translator v0.18.1 // indirect
52-
github.com/go-playground/validator/v10 v10.24.0 // indirect
52+
github.com/go-playground/validator/v10 v10.26.0 // indirect
5353
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
5454
github.com/google/go-cmp v0.7.0 // indirect
5555
github.com/google/uuid v1.6.0 // indirect
56-
github.com/gruntwork-io/terratest v0.48.2 // indirect
56+
github.com/gruntwork-io/terratest v0.49.0 // indirect
5757
github.com/hashicorp/errwrap v1.1.0 // indirect
5858
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
5959
github.com/hashicorp/go-getter/v2 v2.2.3 // indirect
@@ -62,7 +62,7 @@ require (
6262
github.com/hashicorp/go-safetemp v1.0.0 // indirect
6363
github.com/hashicorp/go-version v1.7.0 // indirect
6464
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
65-
github.com/hashicorp/terraform-json v0.24.0 // indirect
65+
github.com/hashicorp/terraform-json v0.25.0 // indirect
6666
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
6767
github.com/jinzhu/copier v0.4.0 // indirect
6868
github.com/josharian/intern v1.0.0 // indirect
@@ -84,18 +84,19 @@ require (
8484
github.com/tmccombs/hcl2json v0.6.4 // indirect
8585
github.com/ulikunitz/xz v0.5.11 // indirect
8686
github.com/xanzy/ssh-agent v0.3.3 // indirect
87-
github.com/zclconf/go-cty v1.15.1 // indirect
87+
github.com/zclconf/go-cty v1.16.2 // indirect
8888
go.mongodb.org/mongo-driver v1.17.2 // indirect
8989
go.opentelemetry.io/otel v1.29.0 // indirect
9090
go.opentelemetry.io/otel/metric v1.29.0 // indirect
9191
go.opentelemetry.io/otel/trace v1.29.0 // indirect
92-
golang.org/x/crypto v0.36.0 // indirect
92+
golang.org/x/crypto v0.38.0 // indirect
9393
golang.org/x/mod v0.18.0 // indirect
94-
golang.org/x/net v0.37.0 // indirect
95-
golang.org/x/sync v0.12.0 // indirect
96-
golang.org/x/sys v0.31.0 // indirect
97-
golang.org/x/text v0.23.0 // indirect
94+
golang.org/x/net v0.39.0 // indirect
95+
golang.org/x/sync v0.14.0 // indirect
96+
golang.org/x/sys v0.33.0 // indirect
97+
golang.org/x/text v0.25.0 // indirect
9898
golang.org/x/tools v0.22.0 // indirect
9999
gopkg.in/warnings.v0 v0.1.2 // indirect
100100
gopkg.in/yaml.v2 v2.4.0 // indirect
101+
sigs.k8s.io/yaml v1.4.0 // indirect
101102
)

0 commit comments

Comments
 (0)