From 0102f5b6fad75c0185b1d287bd676e26111a6966 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 6 Jan 2020 16:56:42 +0100 Subject: [PATCH] remove unecessary inexistant block panic + add test the hcl library will error for us --- hcl2template/parser.go | 2 -- hcl2template/testdata/unknown/block_type.pkr.hcl | 3 +++ hcl2template/types.packer_config_test.go | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 hcl2template/testdata/unknown/block_type.pkr.hcl diff --git a/hcl2template/parser.go b/hcl2template/parser.go index 0bf4ce261..b79c8e3bb 100644 --- a/hcl2template/parser.go +++ b/hcl2template/parser.go @@ -127,8 +127,6 @@ func (p *Parser) parseFile(f *hcl.File, cfg *PackerConfig) hcl.Diagnostics { } cfg.Builds = append(cfg.Builds, build) - default: - panic(fmt.Sprintf("unexpected block type %q", block.Type)) // TODO(azr): err } } diff --git a/hcl2template/testdata/unknown/block_type.pkr.hcl b/hcl2template/testdata/unknown/block_type.pkr.hcl new file mode 100644 index 000000000..8ae2c40a3 --- /dev/null +++ b/hcl2template/testdata/unknown/block_type.pkr.hcl @@ -0,0 +1,3 @@ + +potato { +} diff --git a/hcl2template/types.packer_config_test.go b/hcl2template/types.packer_config_test.go index 38afe10da..0e410a850 100644 --- a/hcl2template/types.packer_config_test.go +++ b/hcl2template/types.packer_config_test.go @@ -90,6 +90,13 @@ func TestParser_complete(t *testing.T) { getBuildsWantBuilds: []packer.Build{}, getBuildsWantDiags: true, }, + {name: "unknown block type", + parser: defaultParser, + args: parseTestArgs{"testdata/unknown"}, + parseWantCfg: &PackerConfig{}, + parseWantDiags: true, + parseWantDiagHasErrors: true, + }, } testParse(t, tests) }