Skip to content

Commit 1ef92ad

Browse files
ocofaighocofaigh
authored
feat: updates to consume latest DA dependencies (#232)
1 parent 76b2441 commit 1ef92ad

File tree

4 files changed

+50
-54
lines changed

4 files changed

+50
-54
lines changed

‎ibm_catalog.json‎

Lines changed: 47 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -89,26 +89,19 @@
8989
],
9090
"notes": "[Optional] Required to create the containers-kubernetes-key needed by the OpenShift cluster on IBM Cloud."
9191
},
92-
{
93-
"role_crns": [
94-
"crn:v1:bluemix:public:iam::::role:Administrator"
95-
],
96-
"service_name": "All Account Management services",
97-
"notes": "[Optional] Required to create new resource groups when enabling the Account Configuration integration."
98-
},
9992
{
10093
"role_crns": [
10194
"crn:v1:bluemix:public:iam::::role:Administrator"
10295
],
10396
"service_name": "All Identity and Access enabled services",
104-
"notes": "[Optional] Required to create new resource groups with account settings when enabling the Account Configuration integration."
97+
"notes": "[Optional] Required to to create trusted profile for App Configuration aggregator which is used for compliance scanning."
10598
},
10699
{
107100
"service_name": "is.vpc",
108101
"role_crns": [
109102
"crn:v1:bluemix:public:iam::::role:Administrator"
110103
],
111-
"notes": "[Optional] Required for creating Virtual Private Cloud(VPC)."
104+
"notes": "[Optional] Required for creating Virtual Private Cloud (VPC)."
112105
},
113106
{
114107
"service_name": "cloud-object-storage",
@@ -221,6 +214,10 @@
221214
{
222215
"key": "prefix",
223216
"required": true,
217+
"default_value": "dev",
218+
"random_string": {
219+
"length": 4
220+
},
224221
"value_constraints": [
225222
{
226223
"type": "regex",
@@ -240,7 +237,22 @@
240237
"required": true
241238
},
242239
{
240+
"key": "existing_resource_group_name",
243241
"display_name": "resource_group",
242+
"custom_config": {
243+
"type": "resource_group",
244+
"grouping": "deployment",
245+
"original_grouping": "deployment",
246+
"config_constraints": {
247+
"identifier": "rg_name"
248+
}
249+
},
250+
"default_value": "Default",
251+
"description": "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group.",
252+
"virtual": true
253+
},
254+
{
255+
"display_name": "cluster_resource_group",
244256
"key": "cluster_resource_group_id",
245257
"custom_config": {
246258
"type": "resource_group",
@@ -772,7 +784,7 @@
772784
"required": true,
773785
"virtual": true,
774786
"type": "number",
775-
"default_value": 2,
787+
"default_value": 1,
776788
"description": "Number of worker nodes in each zone of the cluster."
777789
},
778790
{
@@ -798,39 +810,19 @@
798810
"description": "The operating system installed on the worker nodes. [Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)."
799811
},
800812
{
801-
"key": "allow_public_access_to_cluster",
813+
"key": "allow_public_access_to_cluster_management",
802814
"type": "boolean",
803815
"required": true,
804816
"virtual": true,
805-
"default_value": false,
806-
"options": [
807-
{
808-
"displayname": "true",
809-
"value": "true"
810-
},
811-
{
812-
"displayname": "false",
813-
"value": "false"
814-
}
815-
],
816-
"description": "When set to `true`, public endpoint will be enabled for the cluster which will allow access to master node of the cluster from outside the VPC network."
817+
"default_value": true,
818+
"description": "Set to true to access the cluster through a public cloud service endpoint. [Learn More](https://cloud.ibm.com/docs/openshift?topic=openshift-access_cluster)."
817819
},
818820
{
819821
"key": "allow_outbound_traffic",
820822
"type": "boolean",
821823
"required": true,
822824
"virtual": true,
823-
"default_value": false,
824-
"options": [
825-
{
826-
"displayname": "true",
827-
"value": "true"
828-
},
829-
{
830-
"displayname": "false",
831-
"value": "false"
832-
}
833-
],
825+
"default_value": true,
834826
"description": "Set to true to allow public outbound access from the cluster workers."
835827
},
836828
{
@@ -878,17 +870,7 @@
878870
"default_value": false,
879871
"description": "When set to `true`, the IBM Cloud Monitoring instance will be configured to collect platform metrics from the provided region. ⚠️ You can configure 1 instance only of the IBM Cloud Monitoring service per region to collect platform metrics in that location. Check with the account or service administrator if another monitoring instance has already been configured. You may not have permissions to see all monitoring instances in the region. [Learn more](https://cloud.ibm.com/docs/monitoring?topic=monitoring-platform_metrics_enabling).",
880872
"required": true,
881-
"virtual": true,
882-
"options": [
883-
{
884-
"displayname": "true",
885-
"value": "true"
886-
},
887-
{
888-
"displayname": "false",
889-
"value": "false"
890-
}
891-
]
873+
"virtual": true
892874
},
893875
{
894876
"key": "logs_routing_tenant_regions",
@@ -928,7 +910,7 @@
928910
"name": "deploy-arch-ibm-cloud-monitoring",
929911
"description": "Sets up a Cloud Monitoring instance to gain operational visibility on applications running on OpenShift Cluster.",
930912
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
931-
"version": "v1.7.2",
913+
"version": "v1.9.0",
932914
"flavors": [
933915
"fully-configurable"
934916
],
@@ -941,6 +923,11 @@
941923
"version_input": "region",
942924
"reference_version": true
943925
},
926+
{
927+
"dependency_input": "existing_resource_group_name",
928+
"version_input": "existing_resource_group_name",
929+
"reference_version": true
930+
},
944931
{
945932
"dependency_input": "prefix",
946933
"version_input": "prefix",
@@ -966,7 +953,7 @@
966953
"name": "deploy-arch-ibm-scc-workload-protection",
967954
"description": "Configure an IBM Cloud Security and Compliance Center Workload Protection instance to help you manage security and compliance for your organization.",
968955
"id": "4322cf44-2289-49aa-a719-dd79e39b14dc-global",
969-
"version": "v1.12.3",
956+
"version": "v1.14.0",
970957
"flavors": [
971958
"fully-configurable"
972959
],
@@ -984,6 +971,11 @@
984971
"version_input": "prefix",
985972
"reference_version": true
986973
},
974+
{
975+
"dependency_input": "existing_resource_group_name",
976+
"version_input": "existing_resource_group_name",
977+
"reference_version": true
978+
},
987979
{
988980
"dependency_input": "scc_workload_protection_instance_name",
989981
"version_input": "scc_workload_protection_instance_name",
@@ -1028,6 +1020,11 @@
10281020
"version_input": "prefix",
10291021
"reference_version": true
10301022
},
1023+
{
1024+
"dependency_input": "existing_resource_group_name",
1025+
"version_input": "existing_resource_group_name",
1026+
"reference_version": true
1027+
},
10311028
{
10321029
"dependency_input": "region",
10331030
"version_input": "region",
@@ -1049,8 +1046,8 @@
10491046
"reference_version": true
10501047
},
10511048
{
1052-
"dependency_input": "allow_public_access_to_cluster",
1053-
"version_input": "allow_public_access_to_cluster",
1049+
"dependency_input": "allow_public_access_to_cluster_management",
1050+
"version_input": "allow_public_access_to_cluster_management",
10541051
"reference_version": true
10551052
},
10561053
{
@@ -1094,7 +1091,7 @@
10941091
"reference_version": true
10951092
}
10961093
],
1097-
"version": "v3.63.1"
1094+
"version": "v3.66.0"
10981095
}
10991096
],
11001097
"dependency_version_2": true,

‎tests/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.25.3
77
require (
88
github.com/gruntwork-io/terratest v0.51.0
99
github.com/stretchr/testify v1.11.1
10-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.15
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.17
1111
)
1212

1313
require (

‎tests/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
296296
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
297297
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
298298
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
299-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.15 h1:vTLAB97MQ45Hfla67pIWYnb/Z5YuEzRLjQ6WN4GHWgI=
300-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.15/go.mod h1:g0kmBhFk6pVoTmse42tMNCSNktiOYJHAda/pAzOIxco=
299+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.17 h1:unGRxvM9OJBTsfDQg/AZCYOeJZ5TqrCsPphjWJ2wI94=
300+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.17/go.mod h1:g0kmBhFk6pVoTmse42tMNCSNktiOYJHAda/pAzOIxco=
301301
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
302302
github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=
303303
github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=

‎tests/pr_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ func TestAgentDefaultConfiguration(t *testing.T) {
305305
"deploy-arch-ibm-monitoring-agent",
306306
"fully-configurable",
307307
map[string]interface{}{
308-
"prefix": options.Prefix,
309308
"region": "eu-de",
310309
},
311310
)

0 commit comments

Comments
 (0)