fix: Added fix to ensure the plan upgrade should be completed before attempting to set the quota (#326)

shemau · web-flow · commit 3f3061418418 · 2025-10-30T14:55:09.000Z
diff --git a/README.md b/README.md
@@ -40,13 +40,14 @@ module "upgrade-plan" {
   source  = "terraform-ibm-modules/container-registry/ibm//modules/plan"
   version = "X.Y.Z" # Replace "X.Y.Z" with a release version to lock into a specific release
 }
+
 module "set_quota" {
   source  = "terraform-ibm-modules/container-registry/ibm//modules/quotas"
   version = "X.Y.Z" # Replace "X.Y.Z" with a release version to lock into a specific release
-  update_storage_quota        = true
-  storage_megabytes           = 5 * 1024 # 5GiB
-  update_traffic_quota        = true
-  traffic_megabytes           = 500 # 500 MB
+  storage_megabytes = 5 * 1024 # 5GiB
+  traffic_megabytes = 500 # 500 MB
+  # Issue 324: Upgrade plan before setting quota
+  depends_on        = [module.upgrade_plan]
 }
 ```
 
diff --git a/common-dev-assets b/common-dev-assets
@@ -1 +1 @@
-Subproject commit e69bd8dff2b1305cd376f2549667743320c7a9b9
+Subproject commit c4328778ce1a62bc85f641d9249adaac0493cfc9
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -24,11 +24,13 @@ module "namespace" {
 }
 
 module "upgrade_plan" {
-  source = "../..//modules/plan"
+  source = "../../modules/plan"
 }
 
 module "set_quota" {
   source            = "../../modules/quotas"
   storage_megabytes = 5 * 1024 - 1
   traffic_megabytes = 499
+  # Issue 324: Upgrade plan before extending quota
+  depends_on = [module.upgrade_plan]
 }
diff --git a/modules/quotas/README.md b/modules/quotas/README.md
@@ -14,12 +14,16 @@ module "upgrade-plan" {
   version = "X.X.X" # Replace "X.X.X" with a release version to lock into a specific release
   container_registry_endpoint = "us.icr.io"
 }
+
+# Set quota:
 module "set_quota" {
   source  = "terraform-ibm-modules/container-registry/ibm//modules/quotas"
   version = "X.X.X" # Replace "X.X.X" with a release version to lock into a specific release
   container_registry_endpoint = "us.icr.io"
   storage_megabytes           = 5 * 1024 # 5GiB
   traffic_megabytes           = 500 # 500 MB
+  # Issue 324: Upgrade plan before setting quota
+  depends_on                  = [module.upgrade_plan]
 }
 ```
 
diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf
@@ -37,4 +37,6 @@ module "set_quota" {
   container_registry_endpoint = var.provider_visibility == "private" ? module.cr_endpoint.container_registry_endpoint_private : module.cr_endpoint.container_registry_endpoint
   storage_megabytes           = var.storage_megabytes
   traffic_megabytes           = var.traffic_megabytes
+  # Issue 324: Upgrade plan before setting quota
+  depends_on = [module.upgrade_plan]
 }

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,13 @@ module "namespace" {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`module "upgrade_plan" {`
`27`		`- source = "../..//modules/plan"`
	`27`	`+ source = "../../modules/plan"`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`module "set_quota" {`
`31`	`31`	`source = "../../modules/quotas"`
`32`	`32`	`storage_megabytes = 5 * 1024 - 1`
`33`	`33`	`traffic_megabytes = 499`
	`34`	`+ # Issue 324: Upgrade plan before extending quota`
	`35`	`+ depends_on = [module.upgrade_plan]`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,6 @@ module "set_quota" {`
`37`	`37`	`container_registry_endpoint = var.provider_visibility == "private" ? module.cr_endpoint.container_registry_endpoint_private : module.cr_endpoint.container_registry_endpoint`
`38`	`38`	`storage_megabytes = var.storage_megabytes`
`39`	`39`	`traffic_megabytes = var.traffic_megabytes`
	`40`	`+ # Issue 324: Upgrade plan before setting quota`
	`41`	`+ depends_on = [module.upgrade_plan]`
`40`	`42`	`}`