iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9257 from hashicorp/azr-hcl2-use-source-type-and-name 

HCL2: use source type and name as Name of a CoreBuild
This commit is contained in:
Megan Marsh 2020-05-20 11:36:15 -07:00 committed by GitHub
parent 3c782e9d03 b01fb30c36
commit 24dd7e9dbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -10,6 +10,8 @@
* **New post-processor** Yandex Export [GH-9124] * **New post-processor** Yandex Export [GH-9124]
### IMPROVEMENTS: ### IMPROVEMENTS:
* core: HCL logs now display source type and source name (`type.name`) in logs
to differentiate more easily who says what. [GH-9257]
* builder/amazon: Add SSM Session Manager as a SSH interface connection * builder/amazon: Add SSM Session Manager as a SSH interface connection
[GH-9082] [GH-9082]
* builder/google: Implement iap proxy for googlecompute [GH-9105] * builder/google: Implement iap proxy for googlecompute [GH-9105]

2
hcl2template/types.packer_config.go
View File

@ -353,7 +353,7 @@ func (cfg *PackerConfig) GetBuilds(opts packer.GetBuildsOptions) ([]packer.Build
} }
pcb := &packer.CoreBuild{ pcb := &packer.CoreBuild{
Type: src.Type, Type: src.Ref().String(),
Builder: builder, Builder: builder,
Provisioners: provisioners, Provisioners: provisioners,
PostProcessors: pps, PostProcessors: pps,

6
hcl2template/types.packer_config_test.go
View File

@ -100,7 +100,7 @@ func TestParser_complete(t *testing.T) {
false, false, false, false,
[]packer.Build{ []packer.Build{
&packer.CoreBuild{ &packer.CoreBuild{
Type: "virtualbox-iso", Type: "virtualbox-iso.ubuntu-1204",
Prepared: true, Prepared: true,
Builder: basicMockBuilder, Builder: basicMockBuilder,
Provisioners: []packer.CoreBuildProvisioner{ Provisioners: []packer.CoreBuildProvisioner{
@ -199,7 +199,7 @@ func TestParser_complete(t *testing.T) {
false, false, false, false,
[]packer.Build{ []packer.Build{
&packer.CoreBuild{ &packer.CoreBuild{
Type: "virtualbox-iso", Type: "virtualbox-iso.ubuntu-1204",
Prepared: true, Prepared: true,
Builder: emptyMockBuilder, Builder: emptyMockBuilder,
Provisioners: []packer.CoreBuildProvisioner{ Provisioners: []packer.CoreBuildProvisioner{
@ -242,7 +242,7 @@ func TestParser_complete(t *testing.T) {
false, false, false, false,
[]packer.Build{ []packer.Build{
&packer.CoreBuild{ &packer.CoreBuild{
Type: "virtualbox-iso", Type: "virtualbox-iso.ubuntu-1204",
Prepared: true, Prepared: true,
Builder: emptyMockBuilder, Builder: emptyMockBuilder,
Provisioners: []packer.CoreBuildProvisioner{ Provisioners: []packer.CoreBuildProvisioner{