From 73b7499811cb0e910114737c6f73f865d736b9d8 Mon Sep 17 00:00:00 2001
From: Adrien Delorme <azr@users.noreply.github.com>
Date: Mon, 23 Nov 2020 16:27:26 +0100
Subject: [PATCH] HCL2: version block: test validation & document
 version/availability (#10298)

* HCL2: Test that the packer block passes in packer validate

* HCL2: Test invalid packer blocks are invalid

* docs: state from which version the packer block is available
---
 command/test-fixtures/validate/build.pkr.hcl                | 4 ++++
 command/test-fixtures/validate/invalid_packer_block.pkr.hcl | 3 +++
 command/validate_test.go                                    | 3 +++
 website/pages/docs/from-1.5/blocks/packer.mdx               | 2 ++
 4 files changed, 12 insertions(+)
 create mode 100644 command/test-fixtures/validate/invalid_packer_block.pkr.hcl

diff --git a/command/test-fixtures/validate/build.pkr.hcl b/command/test-fixtures/validate/build.pkr.hcl
index 416189e5a..b70cd535f 100644
--- a/command/test-fixtures/validate/build.pkr.hcl
+++ b/command/test-fixtures/validate/build.pkr.hcl
@@ -1,3 +1,7 @@
+packer {
+  required_version = ">= v1.0.0"
+}
+
 source "file" "chocolate" {
   target = "chocolate.txt"
   content = "chocolate"
diff --git a/command/test-fixtures/validate/invalid_packer_block.pkr.hcl b/command/test-fixtures/validate/invalid_packer_block.pkr.hcl
new file mode 100644
index 000000000..6388be9fd
--- /dev/null
+++ b/command/test-fixtures/validate/invalid_packer_block.pkr.hcl
@@ -0,0 +1,3 @@
+packer {
+  version = ">= v1.0.0"
+}
diff --git a/command/validate_test.go b/command/validate_test.go
index f8884cd18..ede32c1a3 100644
--- a/command/validate_test.go
+++ b/command/validate_test.go
@@ -26,6 +26,9 @@ func TestValidateCommand(t *testing.T) {
 
 		// wrong version field
 		{path: filepath.Join(testFixture("version_req", "wrong_field_name")), exitCode: 1},
+
+		// wrong packer block
+		{path: filepath.Join(testFixture("validate", "invalid_packer_block.pkr.hcl")), exitCode: 1},
 	}
 
 	for _, tc := range tt {
diff --git a/website/pages/docs/from-1.5/blocks/packer.mdx b/website/pages/docs/from-1.5/blocks/packer.mdx
index 4b0e5b5c4..85d1cc114 100644
--- a/website/pages/docs/from-1.5/blocks/packer.mdx
+++ b/website/pages/docs/from-1.5/blocks/packer.mdx
@@ -11,6 +11,8 @@ description: |-
 
 `@include 'from-1.5/beta-hcl2-note.mdx'`
 
+-> **Note:** The Packer block is only available in Packer v1.6.5 and later.
+
 The `packer` configuration block type is used to configure some
 behaviors of Packer itself, such as the minimum required Packer version needed to 
 apply your configuration.