Commit Graph

43 Commits

Author SHA1 Message Date
Roger Hu 28f8241a05 update generated files 2020-07-10 16:58:06 -07:00
Moss 8ea64c5b35 undocument ssh_keypair_name and ssh_agent_auth 2020-07-02 14:55:58 +02:00
Moss 41edd09d3c undocument temporary_key_pair_name and ssh_private_key_file 2020-07-01 16:33:18 +02:00
mingsheng.su 8a8abdf615
update ucloud-uhost builder (#9466)
* update ucloud-uhost builder, docs and deps

Co-authored-by: Wilken Rivera <dev@wilkenrivera.com>
Co-authored-by: Adrien Delorme <azr@users.noreply.github.com>
2020-06-24 14:31:05 +02:00
Megan Marsh 4f77bb0c4a add new ssh_ciphers option 2020-06-17 16:48:23 -07:00
Megan Marsh 4178625afb re-add winrm_no_proxy option. Winrm code needs to be modified in order to read no_proxy env var when client is created rather than when net/http library is instantiated. 2020-06-16 10:27:30 -07:00
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
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
r_takaishi f50ff1d270 make generate 2020-03-13 11:29:42 +09:00
Sylvia Moss dc31bad539
Sharing info with post-processors via artifact (#8632) 2020-01-30 11:27:58 +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 84063d2132 implement ID and Type values in the provisioner template info sharing 2019-12-13 11:57:01 -08:00
mingsheng.su 37e898e115 optimize code style 2019-10-29 16:11:44 -07:00
mingsheng.su 9de1c42ad4 fix ucloud builder acctest 2019-10-29 16:11:44 -07:00
Megan Marsh a4f95c8e7d fux gebeaj 2019-10-29 16:11:44 -07:00
mingsheng.su 2c513fce64 update ucloud packer 2019-10-29 16:11:43 -07:00
mingsheng.su 61f9d3a9fe add ucloud import 2019-10-29 16:11:43 -07:00
Adrien Delorme 078ba7c8c3 commit old code generation tool
for history
2019-10-15 12:56:42 +02:00
Adrien Delorme 438f704333 fmt 2019-10-15 12:56:42 +02:00
Adrien Delorme 3fe9d52e3f Merge remote-tracking branch 'origin/master' into scrape_doc_to_builder_struct_config 2019-09-20 11:15:44 +02:00
lonegunman 0de807cce0 make ucloud builder's base url configurable 2019-09-12 11:33:57 +08:00
Adrien Delorme 4cb7c30987 Merge remote-tracking branch 'origin/master' into scrape_doc_to_builder_struct_config 2019-08-21 16:44:23 +02:00
mingsheng.su 66f142adf1 update docs 2019-07-26 17:27:58 +08:00
mingsheng.su 59c8911cd5 update api about stop instance 2019-07-26 17:03:57 +08:00
mingsheng.su d3414e31e4
Update builder/ucloud/uhost/step_create_instance.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:05:23 +08:00
mingsheng.su 591f2833b8
Update builder/ucloud/uhost/step_create_instance.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:04:55 +08:00
mingsheng.su 0679f64689
Update builder/ucloud/uhost/step_copy_image.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:04:36 +08:00
mingsheng.su 33d9e1ca49
Update builder/ucloud/uhost/step_copy_image.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:03:11 +08:00
mingsheng.su c8a9447aa4
Update builder/ucloud/uhost/step_create_image.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:02:56 +08:00
mingsheng.su 4dfb338915
Update builder/ucloud/uhost/step_config_vpc.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:02:45 +08:00
mingsheng.su 71fcc9fce3
Update builder/ucloud/uhost/step_config_subnet.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:02:24 +08:00
mingsheng.su 7fdd72d418
Update builder/ucloud/uhost/step_config_security_group.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:02:03 +08:00
mingsheng.su a44df3d899
Update builder/ucloud/uhost/step_config_security_group.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:01:47 +08:00
mingsheng.su e9e5493fd1
Update builder/ucloud/uhost/step_check_source_image.go
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-06-28 12:01:26 +08:00
mingsheng.su 95611695b1 update builder_test && make generate 2019-06-20 18:07:56 +08:00
mingsheng.su 7804a52dd2 ucloud packer review 2019-06-19 21:32:33 +08:00
mingsheng.su 787485f66f add validate project_id 2019-06-14 14:50:46 +08:00
mingsheng.su 9798c86a0d update string to const 2019-06-13 20:17:08 +08:00
mingsheng.su 156d31f933 update acc test 2019-06-13 18:38:07 +08:00
mingsheng.su c8bab9b382 add ucloud packer 2019-06-13 15:16:49 +08:00