From d431db0a3813cd71deb8b4a24d60fa274086c366 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 19 May 2020 17:22:04 +0200 Subject: [PATCH 1/4] HCL2: use source type and name as Name of a CoreBuild --- hcl2template/types.packer_config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hcl2template/types.packer_config.go b/hcl2template/types.packer_config.go index 96293eb18..29e1da811 100644 --- a/hcl2template/types.packer_config.go +++ b/hcl2template/types.packer_config.go @@ -353,7 +353,7 @@ func (cfg *PackerConfig) GetBuilds(opts packer.GetBuildsOptions) ([]packer.Build } pcb := &packer.CoreBuild{ - Type: src.Type, + Type: src.Ref().String(), Builder: builder, Provisioners: provisioners, PostProcessors: pps, From 1ddf2a7d05f4896cb308f1e90d4b11423b11f1ea Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 19 May 2020 17:35:24 +0200 Subject: [PATCH 2/4] Update types.packer_config_test.go --- hcl2template/types.packer_config_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hcl2template/types.packer_config_test.go b/hcl2template/types.packer_config_test.go index 45d9c43c5..844038f19 100644 --- a/hcl2template/types.packer_config_test.go +++ b/hcl2template/types.packer_config_test.go @@ -100,7 +100,7 @@ func TestParser_complete(t *testing.T) { false, false, []packer.Build{ &packer.CoreBuild{ - Type: "virtualbox-iso", + Type: "virtualbox-iso.ubuntu-1204", Prepared: true, Builder: basicMockBuilder, Provisioners: []packer.CoreBuildProvisioner{ @@ -199,7 +199,7 @@ func TestParser_complete(t *testing.T) { false, false, []packer.Build{ &packer.CoreBuild{ - Type: "virtualbox-iso", + Type: "virtualbox-iso.ubuntu-1204", Prepared: true, Builder: emptyMockBuilder, Provisioners: []packer.CoreBuildProvisioner{ @@ -242,7 +242,7 @@ func TestParser_complete(t *testing.T) { false, false, []packer.Build{ &packer.CoreBuild{ - Type: "virtualbox-iso", + Type: "virtualbox-iso.ubuntu-1204", Prepared: true, Builder: emptyMockBuilder, Provisioners: []packer.CoreBuildProvisioner{ From 1e8e8a4e45eeb839524f9136eb690ba61f075eda Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 20 May 2020 12:27:54 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 628622ef7..115d907d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ * **New post-processor** Yandex Export [GH-9124] ### IMPROVEMENTS: +* core: HCL logs now display source type and source name (`type.name`) in logs + to differentiate more easily who says what. * builder/amazon: Add SSM Session Manager as a SSH interface connection [GH-9082] * builder/google: Implement iap proxy for googlecompute [GH-9105] From b01fb30c364f3882b50eeaba04d22d7737f3be32 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 20 May 2020 12:28:13 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 115d907d2..2578e7a12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ ### IMPROVEMENTS: * core: HCL logs now display source type and source name (`type.name`) in logs - to differentiate more easily who says what. + to differentiate more easily who says what. [GH-9257] * builder/amazon: Add SSM Session Manager as a SSH interface connection [GH-9082] * builder/google: Implement iap proxy for googlecompute [GH-9105]