Skip to content

Commit 0151638

Browse files
imprateekshimprateeksh
authored
Merge branch 'main' into deprecate_refs
2 parents f0479e8 + 9b2a3af commit 0151638

File tree

7 files changed

+131
-109
lines changed

7 files changed

+131
-109
lines changed

‎ibm_catalog.json‎

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"crn:v1:bluemix:public:iam::::role:Administrator"
120120
],
121121
"service_name": "All Identity and Access enabled services",
122-
"notes": "[Optional] Required to create new resource groups with account settings when enabling the Account Configuration integration."
122+
"notes": "[Optional] Required to to create trusted profile for App Configuration aggregator which is used for compliance scanning."
123123
},
124124
{
125125
"role_crns": [
@@ -200,6 +200,10 @@
200200
{
201201
"key": "prefix",
202202
"required": true,
203+
"default_value": "dev",
204+
"random_string": {
205+
"length": 4
206+
},
203207
"value_constraints": [
204208
{
205209
"type": "regex",
@@ -545,31 +549,6 @@
545549
}
546550
],
547551
"dependencies": [
548-
{
549-
"name": "deploy-arch-ibm-account-infra-base",
550-
"description": "Organizes your IBM Cloud account with preconfigured resource groups. If not selected, the default resource group is used. Optionally, it can expand to apply recommended security controls via \"with Account Settings\" variation. ",
551-
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
552-
"flavors": [
553-
"resource-group-only",
554-
"resource-groups-with-account-settings"
555-
],
556-
"default_flavor": "resource-group-only",
557-
"id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global",
558-
"input_mapping": [
559-
{
560-
"dependency_input": "prefix",
561-
"version_input": "prefix",
562-
"reference_version": true
563-
},
564-
{
565-
"dependency_output": "workload_resource_group_name",
566-
"version_input": "existing_resource_group_name"
567-
}
568-
],
569-
"optional": true,
570-
"on_by_default": false,
571-
"version": "v3.0.23"
572-
},
573552
{
574553
"name": "deploy-arch-ibm-kms",
575554
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
@@ -588,6 +567,11 @@
588567
"version_input": "prefix",
589568
"reference_version": true
590569
},
570+
{
571+
"dependency_input": "existing_resource_group_name",
572+
"version_input": "existing_resource_group_name",
573+
"reference_version": true
574+
},
591575
{
592576
"dependency_input": "region",
593577
"version_input": "region",
@@ -609,7 +593,7 @@
609593
],
610594
"optional": true,
611595
"on_by_default": true,
612-
"version": "v5.1.27"
596+
"version": "v5.4.0"
613597
},
614598
{
615599
"name": "deploy-arch-ibm-cos",
@@ -641,7 +625,7 @@
641625
],
642626
"optional": true,
643627
"on_by_default": true,
644-
"version": "v10.2.21"
628+
"version": "v10.5.0"
645629
},
646630
{
647631
"name": "deploy-arch-ibm-cloud-logs",
@@ -651,7 +635,7 @@
651635
"fully-configurable"
652636
],
653637
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
654-
"version": "v1.6.28",
638+
"version": "v1.9.0",
655639
"optional": true,
656640
"on_by_default": true,
657641
"input_mapping": [
@@ -660,6 +644,11 @@
660644
"version_input": "prefix",
661645
"reference_version": true
662646
},
647+
{
648+
"dependency_input": "existing_resource_group_name",
649+
"version_input": "existing_resource_group_name",
650+
"reference_version": true
651+
},
663652
{
664653
"dependency_input": "existing_cos_instance_crn",
665654
"version_input": "existing_cos_instance_crn",
@@ -686,7 +675,7 @@
686675
"name": "deploy-arch-ibm-cloud-monitoring",
687676
"description": "Sets up a Cloud Monitoring instance to collect the platform metrics.",
688677
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
689-
"version": "v1.7.2",
678+
"version": "v1.9.0",
690679
"flavors": [
691680
"fully-configurable"
692681
],
@@ -699,6 +688,11 @@
699688
"version_input": "enable_platform_metrics",
700689
"reference_version": true
701690
},
691+
{
692+
"dependency_input": "existing_resource_group_name",
693+
"version_input": "existing_resource_group_name",
694+
"reference_version": true
695+
},
702696
{
703697
"dependency_input": "prefix",
704698
"version_input": "prefix",
@@ -708,24 +702,14 @@
708702
"dependency_input": "region",
709703
"version_input": "region",
710704
"reference_version": true
711-
},
712-
{
713-
"dependency_input": "existing_cos_instance_crn",
714-
"version_input": "existing_cos_instance_crn",
715-
"reference_version": true
716-
},
717-
{
718-
"dependency_input": "existing_kms_instance_crn",
719-
"version_input": "existing_kms_instance_crn",
720-
"reference_version": true
721705
}
722706
]
723707
},
724708
{
725709
"name": "deploy-arch-ibm-activity-tracker",
726710
"description": "Configure Activity Tracker Event Routing to route the auditing events.",
727711
"id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
728-
"version": "v1.2.34",
712+
"version": "v1.4.3",
729713
"flavors": [
730714
"fully-configurable"
731715
],
@@ -738,6 +722,11 @@
738722
"version_input": "prefix",
739723
"reference_version": true
740724
},
725+
{
726+
"dependency_input": "existing_resource_group_name",
727+
"version_input": "existing_resource_group_name",
728+
"reference_version": true
729+
},
741730
{
742731
"dependency_input": "region",
743732
"version_input": "region",
@@ -759,7 +748,7 @@
759748
"name": "deploy-arch-ibm-scc-workload-protection",
760749
"description": "Configure an IBM Cloud Security and Compliance Center Workload Protection instance to help you manage security and compliance for your organization.",
761750
"id": "4322cf44-2289-49aa-a719-dd79e39b14dc-global",
762-
"version": "v1.12.3",
751+
"version": "v1.14.0",
763752
"flavors": [
764753
"fully-configurable"
765754
],
@@ -776,6 +765,11 @@
776765
"dependency_input": "region",
777766
"version_input": "region",
778767
"reference_version": true
768+
},
769+
{
770+
"dependency_input": "existing_resource_group_name",
771+
"version_input": "existing_resource_group_name",
772+
"reference_version": true
779773
}
780774
]
781775
}

‎solutions/fully-configurable/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ locals {
88

99
module "resource_group" {
1010
source = "terraform-ibm-modules/resource-group/ibm"
11-
version = "1.3.0"
11+
version = "1.4.0"
1212
existing_resource_group_name = var.existing_resource_group_name
1313
}
1414

‎solutions/fully-configurable/outputs.tf‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,28 @@ output "security_group_details" {
109109
description = "Details of security group."
110110
value = module.vpc.security_group_details
111111
}
112+
113+
output "next_steps_text" {
114+
value = "Your Virtual Private Cloud is ready."
115+
description = "Next steps text"
116+
}
117+
118+
output "next_step_primary_label" {
119+
value = "Go to Virtual Private Cloud"
120+
description = "Primary label"
121+
}
122+
123+
output "next_step_primary_url" {
124+
value = "https://cloud.ibm.com/infrastructure/network/vpc/${var.region}~${module.vpc.vpc_id}/overview"
125+
description = "Primary URL"
126+
}
127+
128+
output "next_step_secondary_label" {
129+
value = "Virtual Private Cloud overview page"
130+
description = "Secondary label"
131+
}
132+
133+
output "next_step_secondary_url" {
134+
value = "https://cloud.ibm.com/docs/vpc?topic=vpc-about-vpc"
135+
description = "Secondary URL"
136+
}

‎solutions/fully-configurable/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ variable "provider_visibility" {
2121

2222
variable "existing_resource_group_name" {
2323
type = string
24-
description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used."
25-
default = null
24+
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."
25+
default = "Default"
2626
}
2727

2828
variable "prefix" {

‎tests/go.mod‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ toolchain go1.25.0
66

77
require (
88
github.com/IBM/go-sdk-core/v5 v5.21.0
9-
github.com/gruntwork-io/terratest v0.50.0
9+
github.com/gruntwork-io/terratest v0.51.0
1010
github.com/stretchr/testify v1.11.1
11-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.9
11+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.14
1212
)
1313

1414
require (
1515
dario.cat/mergo v1.0.0 // indirect
1616
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
17-
github.com/IBM-Cloud/power-go-client v1.12.0 // indirect
18-
github.com/IBM/cloud-databases-go-sdk v0.8.0 // indirect
19-
github.com/IBM/platform-services-go-sdk v0.86.1 // indirect
20-
github.com/IBM/project-go-sdk v0.3.6 // indirect
17+
github.com/IBM-Cloud/power-go-client v1.13.0 // indirect
18+
github.com/IBM/cloud-databases-go-sdk v0.8.1 // indirect
19+
github.com/IBM/platform-services-go-sdk v0.89.0 // indirect
20+
github.com/IBM/project-go-sdk v0.3.9 // 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
@@ -34,22 +34,23 @@ require (
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.16.2 // indirect
37+
github.com/go-git/go-git/v5 v5.16.3 // 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.23.0 // indirect
41-
github.com/go-openapi/errors v0.22.2 // indirect
41+
github.com/go-openapi/errors v0.22.3 // indirect
4242
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4343
github.com/go-openapi/jsonreference v0.21.0 // indirect
4444
github.com/go-openapi/loads v0.22.0 // indirect
4545
github.com/go-openapi/runtime v0.28.0 // indirect
4646
github.com/go-openapi/spec v0.21.0 // indirect
47-
github.com/go-openapi/strfmt v0.23.0 // indirect
47+
github.com/go-openapi/strfmt v0.24.0 // indirect
4848
github.com/go-openapi/swag v0.23.1 // indirect
4949
github.com/go-openapi/validate v0.24.0 // indirect
5050
github.com/go-playground/locales v0.14.1 // indirect
5151
github.com/go-playground/universal-translator v0.18.1 // indirect
5252
github.com/go-playground/validator/v10 v10.26.0 // indirect
53+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
5354
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
5455
github.com/google/go-cmp v0.7.0 // indirect
5556
github.com/google/uuid v1.6.0 // indirect
@@ -61,7 +62,7 @@ require (
6162
github.com/hashicorp/go-safetemp v1.0.0 // indirect
6263
github.com/hashicorp/go-version v1.7.0 // indirect
6364
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
64-
github.com/hashicorp/terraform-json v0.26.0 // indirect
65+
github.com/hashicorp/terraform-json v0.27.2 // indirect
6566
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
6667
github.com/jinzhu/copier v0.4.0 // indirect
6768
github.com/josharian/intern v1.0.0 // indirect
@@ -73,7 +74,6 @@ require (
7374
github.com/mitchellh/go-homedir v1.1.0 // indirect
7475
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
7576
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
76-
github.com/mitchellh/mapstructure v1.5.0 // indirect
7777
github.com/oklog/ulid v1.3.1 // indirect
7878
github.com/opentracing/opentracing-go v1.2.0 // indirect
7979
github.com/pjbgf/sha1cd v0.3.2 // indirect
@@ -84,21 +84,22 @@ 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.16.3 // indirect
88-
go.mongodb.org/mongo-driver v1.17.3 // indirect
87+
github.com/zclconf/go-cty v1.16.4 // indirect
88+
go.mongodb.org/mongo-driver v1.17.4 // indirect
8989
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
9090
go.opentelemetry.io/otel v1.35.0 // indirect
9191
go.opentelemetry.io/otel/metric v1.35.0 // indirect
9292
go.opentelemetry.io/otel/trace v1.35.0 // indirect
93-
golang.org/x/crypto v0.41.0 // indirect
94-
golang.org/x/mod v0.26.0 // indirect
95-
golang.org/x/net v0.42.0 // indirect
93+
go.yaml.in/yaml/v2 v2.4.2 // indirect
94+
golang.org/x/crypto v0.43.0 // indirect
95+
golang.org/x/mod v0.28.0 // indirect
96+
golang.org/x/net v0.45.0 // indirect
9697
golang.org/x/sync v0.17.0 // indirect
97-
golang.org/x/sys v0.35.0 // indirect
98-
golang.org/x/text v0.28.0 // indirect
99-
golang.org/x/tools v0.35.0 // indirect
98+
golang.org/x/sys v0.37.0 // indirect
99+
golang.org/x/text v0.30.0 // indirect
100+
golang.org/x/tools v0.37.0 // indirect
100101
gopkg.in/warnings.v0 v0.1.2 // indirect
101102
gopkg.in/yaml.v2 v2.4.0 // indirect
102103
gopkg.in/yaml.v3 v3.0.1 // indirect
103-
sigs.k8s.io/yaml v1.4.0 // indirect
104+
sigs.k8s.io/yaml v1.6.0 // indirect
104105
)

0 commit comments

Comments
 (0)