Commit Graph

249 Commits

Author SHA1 Message Date
Megan Marsh 7e0cfd8b77 add undocumented tag to struct-markdown generator so that we can leave internal-use-only fields out of docs 2020-05-01 10:31:38 -07: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
Megan Marsh 1963f3aa6f
Merge pull request #8893 from itzimourakas/feature7379
[WIP] Feature7379 - https://github.com/hashicorp/packer/issues/7379
2020-04-01 09:33:25 -07:00
Ilias Tzimourakas 0f2cb45fc6 added instance principals support for oci builder 2020-03-15 17:22:06 +00:00
r_takaishi f50ff1d270 make generate 2020-03-13 11:29:42 +09:00
Megan Marsh d252a24b82 allow user to set winrm_host override like we do ssh_host override 2020-01-30 15:22:22 -08:00
Sylvia Moss dc31bad539
Sharing info with post-processors via artifact (#8632) 2020-01-30 11:27:58 +01:00
Adrien Delorme a67948f155 fix config pointers 2019-12-19 17:51:57 +01: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 0f6d1beccf add an extra string array to the Prepare() return values in the builder interfaces; this sets up the ability for builders to give the provisioners custom user-accessible build-time variables. 2019-12-16 21:23:05 -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 601007e3e2 pas data into provisioners well 2019-12-11 15:43:38 -08:00
Adrien Delorme 078ba7c8c3 commit old code generation tool
for history
2019-10-15 12:56:42 +02:00
Adrien Delorme 3fa614b5e1 builder.oracle.oci: make ConfigProvider unexported
so that it doesn't temper with hcl2 code generation & parsing.

The field is set only later on after further processing.
2019-10-15 12:56:41 +02:00
Robert Neumayer 7dd579f630 Remove commented code 2019-09-30 12:17:47 +02:00
Robert Neumayer 70b2d300e6 Support defined tags for oci builder 2019-09-27 15:10:04 +02:00
Megan Marsh 242f5b1c9f typos 2019-07-03 13:34:23 -07:00
Megan Marsh c03c3f4410 replace duplicate commHost functions with a single communicator helper that checks for ssh_host and does a statebag lookup for a given key 2019-07-03 13:30:29 -07:00
Megan Marsh eb8c74bf85 allow ssh_host config option to override host logic for all builders 2019-07-02 13:56:28 -07: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 c4f3dccc14 rename interpolation context from ctx to ictx and contexts to ctx to avoid conflicts 2019-04-03 15:56:15 +02:00
Adrien Delorme a4bf94dd3c change Builder to be passed a context for cancellation
we have to to give it to our hook
2019-04-03 15:55:55 +02:00
Megan Marsh b764b1d7e1 fix tests 2019-03-29 15:05:51 -07:00
Megan Marsh a84fc6bde9 remove default ssh_username from oracle classic builder, but add note in docs. 2019-03-29 14:24:12 -07:00
Adrien Delorme 9f82b75e57 Use the hashicorp/go-getter to download files
* removed packer.Cache and references since packer.Cache is never used except in the download step. The download step now uses the new func packer.CachePath(targetPath) for this, the behavior is the same.
* removed download code from packer that was reimplemented into the go-getter library: progress bar, http download restart, checksuming from file, skip already downloaded files, symlinking, make a download cancellable by context.
* on windows if packer is running without symlinking rights and we are getting a local file, the file will be copied instead to avoid errors.
* added unit tests for step_download that are now CI tested on windows, mac & linux.
* files are now downloaded under cache dir `sha1(filename + "?checksum=" + checksum) + file_extension`
* since the output dir is based on the source url and the checksum, when the checksum fails, the file is auto deleted.
* a download file is protected and locked by a file lock,
* updated docs
* updated go modules and vendors
2019-03-13 12:11:58 +01:00
Megan Marsh 19144111dd fix packer crash that occurs when image is nil 2018-12-17 14:54:27 -08:00
Ali Rizvi-Santiago 040a33567e Trying again one more time to prevent import cycles.. Moved common.ExpandUser into packer.ExpandUser.. 2018-12-04 16:54:47 -06:00
Ali Rizvi-Santiago 79b68fb89c Replaced the previous incorrect logic with an re-implementation of common.ExpandUser. 2018-12-04 16:53:33 -06:00
Ali Rizvi-Santiago e04986659a Changed the logic for when to actually prefix a path with a u.HomeDir so that it's only done when a non-absolute path is specified. 2018-12-04 16:53:33 -06:00
Ali Rizvi-Santiago 1a3c3f2ffc Replaced all instances of mitchellh/go-homedir with an implementation based on os/user. 2018-12-04 16:53:33 -06:00
Mikhail Ushanov 536252683e builders: reuse private key file reading function
Signed-off-by: Mikhail Ushanov <gm.mephisto@gmail.com>
2018-11-08 14:25:50 +03:00
Matthew Hooker 3ff038d4d1
remove todo 2018-10-31 12:00:33 -07:00
Matthew Hooker 42cd3e4bf7
Warn if not a pv build but builder image entry is set. cleanup 2018-10-29 15:23:58 -07:00
Matthew Hooker eb976894fc
cleanup 2018-10-27 02:04:36 -07:00
Matthew Hooker c697c9d3de
cleanup 2018-10-26 21:59:26 -07:00
Matthew Hooker f322397413
add config tests 2018-10-26 21:56:39 -07:00
Matthew Hooker 6d6d262308
some final fixes and documentation work 2018-10-26 21:56:00 -07:00
Matthew Hooker 4eba1ee724
remove unused config key 2018-10-26 20:02:51 -07:00
Matthew Hooker 03932f1157
Clean up volumes 2018-10-26 20:02:13 -07:00
Matthew Hooker e2a0cbf7df
move upload script to const 2018-10-26 16:59:23 -07:00
Matthew Hooker 7331d6fc7f
some final clean up 2018-10-26 16:59:23 -07:00
Matthew Hooker ab4f205bf6
correctly building linux/windows now 2018-10-26 16:59:23 -07:00
Matthew Hooker 09de194d8e
trying to wrap the base communicator config but it needs to be prepared 2018-10-26 16:59:22 -07:00
Matthew Hooker ab5e964ca6
Connecting to master instance but not builder 2018-10-26 16:59:22 -07:00
Matthew Hooker ade396e140
don't echo image creation commands 2018-10-26 16:59:22 -07:00
Matthew Hooker 3e966ae38d
make fmt 2018-10-26 16:59:22 -07:00
Matthew Hooker 86f6cf478a
cleanup 2018-10-26 16:59:22 -07:00
Matthew Hooker 6f729d0265
Adding some missing configuration 2018-10-26 16:59:22 -07:00
Matthew Hooker c42be62d90
fix identifier changes from oracle sdk 2018-10-26 16:59:22 -07:00
Matthew Hooker bbb0d450f1
todo 2018-10-26 16:59:22 -07:00
Matthew Hooker be91c99d29
warn about dangling segments.
The client offers no way to bulk delete keys, so for now let's just warn users.
The issue is tracked upstream here: https://github.com/hashicorp/go-oracle-terraform/issues/172
2018-10-26 16:59:22 -07:00
Matthew Hooker ce30e1053e
wip 2018-10-26 16:59:22 -07:00
Matthew Hooker 9f310045fc
split image upload/creation. clean up 2018-10-26 16:59:22 -07:00
Matthew Hooker 420d0ebe3e
fix artifact generation 2018-10-26 16:59:21 -07:00
Matthew Hooker 84bb5d2f6f
create image list 2018-10-26 16:59:21 -07:00
Matthew Hooker fa54a64d28
WIP 2018-10-26 16:59:21 -07:00
Matthew Hooker b84c7df9da
Segments going into per-run subfolder 2018-10-26 16:59:21 -07:00
Matthew Hooker b5c6beb8a3
don't delete segments. registering works now. 2018-10-26 16:59:21 -07:00
Matthew Hooker 705fa976a8
more debugging 2018-10-26 16:59:21 -07:00
Matthew Hooker 2536790e0a
todo 2018-10-26 16:59:21 -07:00
Matthew Hooker 7a35e2408f
fix pty, some todo and refactor of bash scri[t 2018-10-26 16:59:21 -07:00
Matthew Hooker fc301601e1
actually delete temp container 2018-10-26 16:59:21 -07:00
Matthew Hooker cd77d00fd8
delete temporary image container 2018-10-26 16:59:21 -07:00
Matthew Hooker 21f786d686
todo and some clean up. correct values for machine image 2018-10-26 16:59:21 -07:00
Matthew Hooker b222d36669
use 2x volume size 2018-10-26 16:59:21 -07:00
Matthew Hooker 7c577abbcb
WIP: register machine image.
remove passwords
2018-10-26 16:59:21 -07:00
Matthew Hooker 8207ba4fa4
Use jq to create manifest. Upload to compute_images 2018-10-26 16:59:20 -07:00
Matthew Hooker 96e62236ec
upload volume WIP
check upload for error
increase builder volume size to account for chunking
2018-10-26 16:59:20 -07:00
Matthew Hooker 8598e2d0a3
WIP 2018-10-26 16:59:20 -07:00
Matthew Hooker bf7c4a7ad6
wip 2018-10-26 16:59:20 -07:00
Matthew Hooker 445c3fb5bb
cleanup temp keys 2018-10-26 16:59:20 -07:00
Matthew Hooker 098764d8ac
WIP 2018-10-26 16:59:20 -07:00
Matthew Hooker 2db0a03142
image upload WIP 2018-10-26 16:59:20 -07:00
Matthew Hooker 265ee0b0b8
add whitespace 2018-10-26 16:59:20 -07:00
Matthew Hooker 7c26ffef9c
builder instance now runs and is connected to 2018-10-26 16:59:20 -07:00
Matthew Hooker b3ffa975c3
Revert "add boot volume to builder instance"
This reverts commit cbce7b42079d2087bc622fd8c6f65d1339b735d1.
2018-10-26 16:59:20 -07:00
Matthew Hooker 2febfa2c7d
attach volume after instance booted 2018-10-26 16:59:20 -07:00
Matthew Hooker b68f214ca4
add boot volume to builder instance 2018-10-26 16:59:20 -07:00
Matthew Hooker ca3bffcb0d
bugfix and some debug logging 2018-10-26 16:59:19 -07:00
Matthew Hooker 00ff187d77
master instance working 2018-10-26 16:59:19 -07:00
Matthew Hooker e271e88b49
oracle-classic variable volume size WIP 2018-10-26 16:59:19 -07:00
Megan Marsh 38cc525ec7 new option allowing user to clean up the ephemeral ssh key from the authorized_keys file 2018-09-14 11:06:38 -07:00
Megan Marsh a0edaf6c46 Going to revert this change for now, becuase of potential issues that arise from calling Prepare() twice
Revert "use statebag instead of SetSharedState for winRM password"

This reverts commit b35acbd879.
2018-09-10 16:48:42 -07:00
Megan Marsh 9926988ab7
Merge pull request #6621 from hashicorp/ssh_keys_centralised
Merge ssh fields usage
2018-08-30 14:13:21 -07:00
Harvey Lowndes 344e7e8b92 Validation for tag configuration 2018-08-29 15:31:05 -07:00
Harvey Lowndes cc7d4e4a95 Add support for freeform tagging of images 2018-08-29 15:31:05 -07:00
Adrien Delorme cd851f8ac2 use public ssh key & key name from config instead of the statebag 2018-08-29 14:40:33 +02:00
Adrien Delorme 0f9eddda3a builder.oracle: use c.Comm for ssh 2018-08-29 14:40:33 +02:00
Adrien Delorme 51d2aac9f6 SSHPrivateKey => SSHPrivateKeyFile 2018-08-29 14:40:32 +02:00
Megan Marsh b35acbd879 use statebag instead of SetSharedState for winRM password 2018-08-24 13:51:16 -07:00
Megan Marsh 340363a649
Merge pull request #6613 from hashicorp/merge_ssh_config_funcs
Merge ssh config funcs from builders
2018-08-23 16:03:36 -07:00
Adrien Delorme 41f6e0334d refactor all copy pasted sshConfig with into communicator.Config.SSHConfigFunc
* still need to append the auth methods into an array for gracefullness
2018-08-22 17:02:23 +02:00
Megan Marsh ff6a039d5b replace scrubconfig with packer.LogSecretFilter.Set
filter winrm password from logs
Add new root-level packer template option, sensitive-variables, to tell us what user variables to mark sensitive.
2018-08-20 15:35:55 -07:00
Felix Yan f69ab4ed77
Fix a typo in config_test.go 2018-07-31 15:19:45 +08:00
xxx 7630268e1d Incorporate review comments 2018-07-17 17:41:19 +02:00
Robert Neumayer 22e5523faa Allow instance metadata to be specified in config 2018-07-02 10:48:08 +02:00
Owain Lewis b600be009d Pass context into OCI client 2018-06-26 10:17:02 +01:00
Harvey Lowndes a69e2ac78e Support instance display name configuration 2018-06-25 11:45:59 +01:00
Megan Marsh 08218222dc add get windows default credentials to oci builder 2018-05-24 10:47:37 -07:00