Skip to content

fix: add fix for race condition #320

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.

Sign up for GitHub

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
ocofaigh merged 2 commits into from
Dec 10, 2025
Merged

fix: add fix for race condition #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02e6c2c
fix: add fix for race condition
ocofaigh Dec 10, 2025
8183f46
hook failures
ocofaigh Dec 10, 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
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ https://terraform-ibm-modules.github.io/documentation/#/implementation-guideline
## Overview
* [terraform-ibm-app-configuration](#terraform-ibm-app-configuration)
* [Examples](./examples)
* <div style="display: inline-block;"><a href="./examples/advanced">Advanced example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=ac-advanced-example&repository=github.com/terraform-ibm-modules/terraform-ibm-app-configuration/tree/main/examples/advanced" 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/basic">Basic example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=ac-basic-example&repository=github.com/terraform-ibm-modules/terraform-ibm-app-configuration/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/advanced">Advanced example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=ac-advanced-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-app-configuration/tree/main/examples/advanced" 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/basic">Basic example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=ac-basic-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-app-configuration/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>
* [Contributing](#contributing)
<!-- END OVERVIEW HOOK -->

Expand Down Expand Up @@ -108,6 +108,7 @@ For more information on access and permissions, see <https://cloud.ibm.com/docs/
| [ibm_resource_instance.app_config](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/resource_instance) | resource |
| [random_string.en_integration_id](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
| [random_string.kms_integration_id](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
| [time_sleep.wait](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
| [time_sleep.wait_for_en_authorization_policy](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
| [time_sleep.wait_for_kms_authorization_policy](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |

Expand Down
2 changes: 1 addition & 1 deletion common-dev-assets
Open in desktop
Submodule common-dev-assets updated 19 files
+1 −2 .github/CODEOWNERS
+1 −1 .github/workflows/ci.yml
+0 −10 .secrets.baseline
+13 −2 commonRenovateConfig.json
+1 −1 da-assets/da-dependency-updater/requirements.txt
+1 −1 examples/Dockerfile
+28 −6 module-assets/.pre-commit-config.yaml
+23 −2 module-assets/ci/.typos.toml
+0 −82 module-assets/ci/cra-tf-validate-ignore-goals.json
+74 −42 module-assets/ci/install-deps.sh
+0 −158 module-assets/ci/run-cra-scc-v2.sh
+0 −118 module-assets/ci/run-cra.sh
+1 −3 module-assets/ci/run-tests.sh
+14 −2 module-assets/ci/terraformDocOverview.py
+88 −5 module-assets/ci/validateIbmCatalogJson.py
+1 −1 scripts/iks-api-key-reset/reset_iks_api_key.sh
+1 −1 scripts/update-source/README.md
+1 −1 stack-assets/.pre-commit-config.yaml
+1 −1 tests/go.mod
15 changes: 13 additions & 2 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
{
"label": "Fully configurable",
"name": "fully-configurable",
"short_description": "Ideal for users who want flexibility with a reliable starting point.",
"index": 1,
"install_type": "fullstack",
"working_directory": "solutions/fully-configurable",
Expand Down Expand Up @@ -214,7 +215,12 @@
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment"
"original_grouping": "deployment",
"config_constraints": {
"supportedLanguages": [
"hcl"
]
}
}
},
{
Expand Down Expand Up @@ -257,7 +263,12 @@
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment"
"original_grouping": "deployment",
"config_constraints": {
"supportedLanguages": [
"hcl"
]
}
}
},
{
Expand Down
9 changes: 9 additions & 0 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ resource "ibm_app_config_collection" "collections" {
# Configuration aggregator
##############################################################################

# workaround for error "ReplaceSettingsWithContext failed: given app-config instance is not found"
# https://github.ibm.com/devx-app-services/planning/issues/25953
resource "time_sleep" "wait" {
count = var.enable_config_aggregator ? 1 : 0
depends_on = [ibm_resource_instance.app_config]
create_duration = "30s"
}

# Create the required Trusted Profile
module "config_aggregator_trusted_profile" {
count = var.enable_config_aggregator ? 1 : 0
Expand Down Expand Up @@ -177,6 +185,7 @@ module "config_aggregator_trusted_profile_template" {

# Define an aggregation
resource "ibm_config_aggregator_settings" "config_aggregator_settings" {
depends_on = [time_sleep.wait]
count = var.enable_config_aggregator ? 1 : 0
instance_id = ibm_resource_instance.app_config.guid
region = ibm_resource_instance.app_config.location
Expand Down
48 changes: 21 additions & 27 deletions tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,52 @@
module github.com/terraform-ibm-modules/terraform-ibm-app-configuration

go 1.24.0

toolchain go1.25.4
go 1.25.5

require (
github.com/IBM/go-sdk-core v1.1.0
github.com/gruntwork-io/terratest v0.52.0
github.com/IBM/go-sdk-core/v5 v5.21.2
github.com/gruntwork-io/terratest v0.54.0
github.com/stretchr/testify v1.11.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.21
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.61.5
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
github.com/IBM-Cloud/power-go-client v1.13.0 // indirect
github.com/IBM-Cloud/power-go-client v1.14.3 // indirect
github.com/IBM/cloud-databases-go-sdk v0.8.1 // indirect
github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
github.com/IBM/platform-services-go-sdk v0.90.0 // indirect
github.com/IBM/project-go-sdk v0.3.9 // indirect
github.com/IBM/platform-services-go-sdk v0.90.4 // 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
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.1.6 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/cloudflare/circl v1.6.1 // indirect
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
github.com/gabriel-vasile/mimetype v1.4.11 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
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.3 // 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/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
github.com/go-openapi/errors v0.22.3 // indirect
github.com/go-openapi/errors v0.22.5 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/loads v0.22.0 // indirect
github.com/go-openapi/runtime v0.28.0 // indirect
github.com/go-openapi/spec v0.21.0 // indirect
github.com/go-openapi/strfmt v0.24.0 // indirect
github.com/go-openapi/strfmt v0.25.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-openapi/validate v0.24.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.26.0 // indirect
github.com/go-playground/validator/v10 v10.28.0 // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/go-cmp v0.7.0 // indirect
Expand All @@ -60,7 +55,7 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter/v2 v2.2.3 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
Expand All @@ -87,20 +82,19 @@ require (
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/zclconf/go-cty v1.16.4 // indirect
go.mongodb.org/mongo-driver v1.17.4 // indirect
go.mongodb.org/mongo-driver v1.17.6 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
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.2 // indirect
golang.org/x/crypto v0.43.0 // indirect
golang.org/x/mod v0.28.0 // indirect
golang.org/x/net v0.45.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/mod v0.29.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.37.0 // indirect
golang.org/x/text v0.30.0 // indirect
golang.org/x/tools v0.37.0 // indirect
gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/tools v0.38.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading