Merge commit 'e1b28dd15f5ddba6fd919f88d6c64f32b6b18276' into release

github-actions[bot] · github-actions[bot] · commit bad1685620c8 · 2022-06-07T12:47:13.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [1.0.0-canary.4] - 2022-06-07
+
+- Correctly increase version number of new packages
+
 ## [1.0.0-canary.3] - 2022-06-07
 
 - Fixes deployments without Lambdas ([#325](https://github.com/milliHQ/terraform-aws-next-js/pull/325))
diff --git a/README.md b/README.md
@@ -156,7 +156,7 @@ module "cloudfront_cert" {
 
 module "tf_next" {
   source  = "milliHQ/next-js/aws"
-  version = "1.0.0-canary.2"
+  version = "1.0.0-canary.3"
 
   cloudfront_aliases             = local.aliases
   cloudfront_acm_certificate_arn = module.cloudfront_cert.acm_certificate_arn
@@ -169,10 +169,6 @@ module "tf_next" {
   providers = {
     aws.global_region = aws.global_region
   }
-
-  # Uncomment when using in the cloned monorepo for tf-next development
-  # source = "../.."
-  debug_use_local_packages = true
 }
 
 #########
diff --git a/examples/atomic-deployments/main.tf b/examples/atomic-deployments/main.tf
@@ -119,7 +119,7 @@ module "tf_next" {
 
   # Uncomment when using in the cloned monorepo for tf-next development
   # source = "../.."
-  debug_use_local_packages = true
+  # debug_use_local_packages = true
 }
 
 #########
diff --git a/modules/api/variables.tf b/modules/api/variables.tf
@@ -4,7 +4,7 @@ variable "tf_next_module_root" {
 
 variable "api_component_version" {
   type    = string
-  default = "0.12.2"
+  default = "1.0.0-canary.4"
 }
 
 ##########
diff --git a/modules/cloudfront-proxy-config/variables.tf b/modules/cloudfront-proxy-config/variables.tf
@@ -4,7 +4,7 @@
 
 variable "proxy_config_module_version" {
   type    = string
-  default = "0.12.2"
+  default = "1.0.0-canary.4"
 }
 
 variable "lambda_runtime" {
diff --git a/modules/deploy-controller/variables.tf b/modules/deploy-controller/variables.tf
@@ -4,7 +4,7 @@ variable "tf_next_module_root" {
 
 variable "deploy_controller_component_version" {
   type    = string
-  default = "0.12.2"
+  default = "1.0.0-canary.4"
 }
 
 #####################
diff --git a/modules/proxy/variables.tf b/modules/proxy/variables.tf
@@ -4,7 +4,7 @@
 
 variable "proxy_module_version" {
   type    = string
-  default = "1.0.0-canary.3"
+  default = "1.0.0-canary.4"
 }
 
 variable "lambda_default_runtime" {
diff --git a/modules/statics-deploy/variables.tf b/modules/statics-deploy/variables.tf
@@ -1,6 +1,6 @@
 variable "deploy_trigger_module_version" {
   type    = string
-  default = "1.0.0-canary.3"
+  default = "1.0.0-canary.4"
 }
 
 variable "cloudfront_id" {

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ module "tf_next" {`
`119`	`119`
`120`	`120`	`# Uncomment when using in the cloned monorepo for tf-next development`
`121`	`121`	`# source = "../.."`
`122`		`- debug_use_local_packages = true`
	`122`	`+ # debug_use_local_packages = true`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`#########`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ variable "tf_next_module_root" {`
`4`	`4`
`5`	`5`	`variable "api_component_version" {`
`6`	`6`	`type = string`
`7`		`- default = "0.12.2"`
	`7`	`+ default = "1.0.0-canary.4"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`##########`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`variable "proxy_config_module_version" {`
`6`	`6`	`type = string`
`7`		`- default = "0.12.2"`
	`7`	`+ default = "1.0.0-canary.4"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`variable "lambda_runtime" {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ variable "tf_next_module_root" {`
`4`	`4`
`5`	`5`	`variable "deploy_controller_component_version" {`
`6`	`6`	`type = string`
`7`		`- default = "0.12.2"`
	`7`	`+ default = "1.0.0-canary.4"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`#####################`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`variable "proxy_module_version" {`
`6`	`6`	`type = string`
`7`		`- default = "1.0.0-canary.3"`
	`7`	`+ default = "1.0.0-canary.4"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`variable "lambda_default_runtime" {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`variable "deploy_trigger_module_version" {`
`2`	`2`	`type = string`
`3`		`- default = "1.0.0-canary.3"`
	`3`	`+ default = "1.0.0-canary.4"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`variable "cloudfront_id" {`