Adrien Delorme
40947c2bf6
HCL2: generate hcl tags with go-cty tags too ( #9306 )
...
This will allow to generate the config files:
```go
package main
import (
"fmt"
"github.com/hashicorp/hcl/v2/gohcl"
"github.com/hashicorp/hcl/v2/hclwrite"
"github.com/hashicorp/packer/builder/alicloud/ecs"
)
func main() {
name := "name"
app := ecs.FlatConfig{
AlicloudImageName: &name,
ECSSystemDiskMapping: &ecs.FlatAlicloudDiskDevice{
DiskName: &name,
},
}
f := hclwrite.NewEmptyFile()
block := gohcl.EncodeAsBlock(&app, `source "something" "something"`)
f.Body().AppendBlock(block)
fmt.Printf("%s", f.Bytes())
}
```
Will output:
```
source "something" "something" {
packer_user_variables = null
packer_sensitive_variables = null
image_name = "name"
image_share_account = null
image_unshare_account = null
image_copy_regions = null
image_copy_names = null
tags = null
tag = null
system_disk_mapping = { disk_category = null, disk_delete_with_instance = null, disk_descri
ption = null, disk_device = null, disk_encrypted = null, disk_name = "name", disk_size = null, disk_
snapshot_id = null }
image_disk_mappings = null
ssh_remote_tunnels = null
ssh_local_tunnels = null
ssh_public_key = null
ssh_private_key = null
}
```
This is a good first step for #9015 and #9282
fix #9304
2020-05-28 11:19:00 +02:00
Sylvia Moss
1c30a71d09
Replace file shared state by statebag ( #9238 )
2020-05-19 11:49:48 +02:00
Lars Lehtonen
7440c2e6ba
provisioner/windows-shell: remove unused testObjects() ( #9116 )
2020-04-27 10:50:31 +02:00
Adrien Delorme
840e67f775
HCL2: when we see a map generate an attribute spec instead of a block spec ( #9035 )
...
* mapstructure-to-hcl2: when we see a map generate an attribute spec and not a block spec
this will alow to do
tags = {
key = "value"
}
instead of
tags {
key = "value"
}
This will also enable using variables directly for those tags
* generate code
* update tests
2020-04-14 16:05:13 +02:00
Adrien Delorme
4b7132c87c
Merge remote-tracking branch 'origin/master' into sharing_info
2019-12-17 11:57:09 +01:00
Adrien Delorme
0785c2f6fc
build using HCL2 ( #8423 )
...
This follows #8232 which added the code to generate the code required to parse
HCL files for each packer component.
All old config files of packer will keep on working the same. Packer takes one
argument. When a directory is passed, all files in the folder with a name
ending with “.pkr.hcl” or “.pkr.json” will be parsed using the HCL2 format.
When a file ending with “.pkr.hcl” or “.pkr.json” is passed it will be parsed
using the HCL2 format. For every other case; the old packer style will be used.
## 1. the hcl2template pkg can create a packer.Build from a set of HCL (v2) files
I had to make the packer.coreBuild (which is our one and only packer.Build ) a public struct with public fields
## 2. Components interfaces get a new ConfigSpec Method to read a file from an HCL file.
This is a breaking change for packer plugins.
a packer component can be a: builder/provisioner/post-processor
each component interface now gets a `ConfigSpec() hcldec.ObjectSpec`
which allows packer to tell what is the layout of the hcl2 config meant
to configure that specific component.
This ObjectSpec is sent through the wire (RPC) and a cty.Value is now
sent through the already existing configuration entrypoints:
Provisioner.Prepare(raws ...interface{}) error
Builder.Prepare(raws ...interface{}) ([]string, error)
PostProcessor.Configure(raws ...interface{}) error
close #1768
Example hcl files:
```hcl
// file amazon-ebs-kms-key/run.pkr.hcl
build {
sources = [
"source.amazon-ebs.first",
]
provisioner "shell" {
inline = [
"sleep 5"
]
}
post-processor "shell-local" {
inline = [
"sleep 5"
]
}
}
// amazon-ebs-kms-key/source.pkr.hcl
source "amazon-ebs" "first" {
ami_name = "hcl2-test"
region = "us-east-1"
instance_type = "t2.micro"
kms_key_id = "c729958f-c6ba-44cd-ab39-35ab68ce0a6c"
encrypt_boot = true
source_ami_filter {
filters {
virtualization-type = "hvm"
name = "amzn-ami-hvm-????.??.?.????????-x86_64-gp2"
root-device-type = "ebs"
}
most_recent = true
owners = ["amazon"]
}
launch_block_device_mappings {
device_name = "/dev/xvda"
volume_size = 20
volume_type = "gp2"
delete_on_termination = "true"
}
launch_block_device_mappings {
device_name = "/dev/xvdf"
volume_size = 500
volume_type = "gp2"
delete_on_termination = true
encrypted = true
}
ami_regions = ["eu-central-1"]
run_tags {
Name = "packer-solr-something"
stack-name = "DevOps Tools"
}
communicator = "ssh"
ssh_pty = true
ssh_username = "ec2-user"
associate_public_ip_address = true
}
```
2019-12-17 11:25:56 +01:00
Megan Marsh
39fd462b56
change all provision func signatures to use map[string]interface{}
2019-12-12 15:38:32 -08:00
Megan Marsh
0ca7c9f397
fix tests
2019-12-11 16:29:35 -08:00
Megan Marsh
6f418d0e54
get data sharing to a working state with the powershell provisioner
2019-12-11 15:43:38 -08:00
Megan Marsh
f4c3501af5
pass struct of generated data into provision() call
2019-12-11 15:43:38 -08:00
Megan Marsh
7d4353864f
use shell struct in shell-local provisioner and post-processor.
2019-11-21 16:47:29 -08:00
nywilken
3522e13b1e
provisioner/shell: Add env_var_format support to shell provisioner
...
* Move setting of default EnvVarFormat to the Prepare function
* Add generated hcl2 structure for the updated Shell provisioner config
* Move `EnvVarFormat` field to shared common shell type
* Add description for the `env_var_format` parameter
* Update `env_var_format` when used with `use_env_var_file`
2019-11-06 16:28:56 -05:00
Adrien Delorme
078ba7c8c3
commit old code generation tool
...
for history
2019-10-15 12:56:42 +02:00
Adrien Delorme
193d3e6bbd
provisioner.windows-shell: demove duplicate ExecuteCommand field
2019-10-15 12:56:42 +02:00
Adrien Delorme
d72040f4fa
move retry code into the common/retry pkg and make retry context aware
2019-04-09 17:46:38 +02:00
Adrien Delorme
f555e7a9f2
allow a provisioner to timeout
...
* I had to contextualise Communicator.Start and RemoteCmd.StartWithUi
NOTE: Communicator.Start starts a RemoteCmd but RemoteCmd.StartWithUi will run the cmd and wait for a return, so I renamed StartWithUi to RunWithUi so that the intent is clearer.
Ideally in the future RunWithUi will be named back to StartWithUi and the exit status or wait funcs of the command will allow to wait for a return. If you do so please read carrefully https://golang.org/pkg/os/exec/#Cmd.Stdout to avoid a deadlock
* cmd.ExitStatus to cmd.ExitStatus() is now blocking to avoid race conditions
* also had to simplify StartWithUi
2019-04-08 20:09:21 +02:00
Adrien Delorme
a81abd297b
Merge remote-tracking branch 'origin/master' into context_provisioner
2019-04-08 20:09:01 +02:00
Adrien Delorme
c7ce4d598e
change Provisioner to be passed a context for cancellation
2019-04-03 15:55:54 +02:00
Megan Marsh
0e6c779a88
allow user to access env_var_format in windows_shell call
2019-03-27 15:25:32 -07:00
Adrien Delorme
72e5ae9ddc
use ValidExitCode in provisioners windows-shell, powershell and shell
2019-03-14 12:47:22 +01:00
Adrien Delorme
30a65c858a
regroup shell provisioner params into a common struct
2019-03-14 11:57:54 +01:00
Adrien Delorme
8fea9439f8
windows-shell provisioner: allow to pass ValidExitCodes
2019-03-14 11:17:06 +01:00
Adrien Delorme and Matthew Patton
b7222d1f56
Add tmp package that offers Dir & File funcs
...
this regroups the calls of tmp func calls into one package.
the tmp pkg allows to store tmp files under a common directory for easier managment
Squashed commit of the following:
commit 74b674c015fc94b571466001525d[email protected] fc94b57142[email protected] 5a562359f4[email protected] 9d5a4a0935[email protected] fbae4c2e05[email protected] 3590fae8bd[email protected] d5c5306a97[email protected] 0a72297da8[email protected] 20f68228b6[email protected] c73ebe3d83[email protected] 63549b8bd7[email protected] 9761010749[email protected] 95159afbc0[email protected] 66001525d7[email protected] e9b6adefea[email protected] 852113ed07[email protected] 54add38d1d[email protected] 6b5b8f6d4e[email protected] c22092c601[email protected] 7a73045091[email protected] 0f2933adb6[email protected] d74839ede0[email protected] eb65416619[email protected] acaa2b31ed[email protected] e573fde668[email protected] 39a9874afc8a413cfe83315812c2[email protected] https://github.com/hashicorp/packer into prestine
commit 8a413cfe83e07491de54e14710a6[email protected] e07491de5942610a35da1fa35dff[email protected] 42610a35d55298142da0d63cf7bc[email protected] 5298142da67bb110bc79d9736552[email protected] 7bb110bc74a61c869ca6189d66e7[email protected] a61c869ca7098101dd94be5f072c[email protected] 098101dd99fefaf0fa6554b2b4a5[email protected] [email protected]
2018-12-12 16:35:57 +01:00
Megan Marsh
e69391f28b
save users some bash scripting by exposing IP and port separately as well as together
2018-12-06 09:29:07 -08:00
DanHam
69ac7b56f6
Remove tmp files created by provisioner/windows-shell tests
2018-04-30 20:38:03 +01:00
DanHam
7cf31060eb
Remove script containing Win-Shell inline commands from local tmp when done
2018-04-26 00:32:52 +01:00
Josh Soref
24b4c36fc9
spelling: function
2018-03-13 07:52:02 +00:00
Josh Soref
b545c6f87e
spelling: flattened
2018-03-13 07:50:25 +00:00
Luke Farnell
d9a5b69403
clean up ineffectual assignments
2017-08-07 13:20:01 -04:00
Matthew Hooker
81522dced0
move packer to hashicorp
2017-04-04 13:39:01 -07:00
Matthew Hooker
de296ac06b
simplify
2017-03-28 20:45:25 -07:00
Matthew Hooker
0149f679de
Print instead of Printf with no dynamic first variable.
2017-03-28 20:36:20 -07:00
DanHam
28051a9218
provisioner/windows-shell: fix and compact env var test
2017-01-23 12:10:46 +00:00
DanHam
e8db6b9b9a
provisioner/windows-shell: Remove env var check - again checked in prepare
2017-01-23 12:10:46 +00:00
DanHam
2bd9fa6c70
Use counter for index. Sort stray comments.
2017-01-19 12:12:00 +00:00
Matthew Hooker
c33cef9c12
tests for equals in windows-shell
2017-01-18 12:51:14 -08:00
DanHam
49bc2e353f
Fix to allow equals in value of environment variable. Mirrors #4328
2017-01-18 12:42:25 -08:00
Matthew Hooker
480398c3d2
only set PACKER_HTTP_ADDR if a server is listening
2017-01-17 17:17:36 -08:00
Matthew Hooker
6563eb213c
Document. add to windows-shell and powershell
2017-01-17 17:07:36 -08:00
Taliesin Sisson
335615408a
Run go fmt on files
2016-12-12 22:45:19 +00:00
Taliesin Sisson
c88a2ef872
Remove trailing tabs
2016-12-12 22:45:10 +00:00
Taliesin Sisson
55353fae89
Fix spelling mistake
...
Fix code type for formatting
Remove empty space
2016-12-12 22:45:09 +00:00
Taliesin Sisson
6c3030c73a
Add a little safety around variables that are passed into provisioner.
2016-12-12 22:44:10 +00:00
Mitchell Hashimoto
7c8e86c9c5
provisioner/*: fix interpolation context
2015-06-22 12:26:54 -07:00
Mitchell Hashimoto
339a4ccdab
provisioner/windows-shell
2015-06-14 11:23:29 -07:00
Adrien Delorme
Sylvia Moss
Lars Lehtonen
Adrien Delorme
Megan Marsh
nywilken
DanHam
Josh Soref
Luke Farnell
Matthew Hooker
Taliesin Sisson
Taliesin Sisson
Mitchell Hashimoto