Merge branch 'main' into conf24

Author: rcastley

.bumpversion.cfg

@@ -14,17 +14,17 @@ search = WSVERSION={current_version}
 replace = WSVERSION={new_version}
 
 [bumpversion:file:workshop/aws/ec2/terraform.tfvars.template]
-search = default     = "{current_version}"
-replace = default     = "{new_version}"
+search = wsversion = "{current_version}"
+replace = wsversion = "{new_version}"
 
 [bumpversion:file:deprecated/multipass/terraform.tfvars.template]
-search = default     = "{current_version}"
-replace = default     = "{new_version}"
+replace = wsversion = "{new_version}"
+search = wsversion = "{current_version}"
 
 [bumpversion:file:deprecated/multipass/main.tf]
-search = default = "{current_version}"
-replace = default = "{new_version}"
+search = default     = "{current_version}"
+replace = default     = "{new_version}"
 
 [bumpversion:file:workshop/aws/ec2/variables.tf]
-search = default = "{current_version}"
-replace = default = "{new_version}"
+search = default     = "{current_version}"
+replace = default     = "{new_version}"