Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge the vSphere builder #8480

Merged
merged 274 commits into from Jan 15, 2020
Merged

Merge the vSphere builder #8480

merged 274 commits into from Jan 15, 2020

Conversation

@randomcamel
Copy link
Member

randomcamel commented Dec 10, 2019

This is to merge the vSphere builder written
by JetBrains and others.

Closes #8532
Closes #4526

@SwampDragons

This comment has been minimized.

Copy link
Member

SwampDragons commented Dec 12, 2019

Thanks for opening this!

@azr

This comment has been minimized.

Copy link
Member

azr commented Dec 16, 2019

2 signatures to go 🎉

@azr

This comment has been minimized.

Copy link
Member

azr commented Jan 7, 2020

@remijouannet, @scbjans; sorry for pinging you, we only need you two to sign the cla so that your work can be incorporated into Packer 🙂 then, we can/will help maintain it onwards !!! 😄.

How does that sound to you ?

@remijouannet

This comment has been minimized.

Copy link
Contributor

remijouannet commented Jan 7, 2020

hello, CLA sign

@SwampDragons

This comment has been minimized.

Copy link
Member

SwampDragons commented Jan 7, 2020

Thanks so much for signing the CLA, folks! I'll take it from here.

SwampDragons added 2 commits Jan 7, 2020
…ove README into packer website as separated docs for vsphere-clone and vsphere-iso. Move option descriptions into struct code, and generate documentation directly from those structs as we do inside of the other builders
@marema31

This comment has been minimized.

Copy link
Contributor

marema31 commented Jan 8, 2020

@SwampDragons , If you need for your tests , I can give you access to a vSphere.

@SwampDragons

This comment has been minimized.

Copy link
Member

SwampDragons commented Jan 8, 2020

Thanks, I'm working on getting some set up internally, just takes a bit of time :D

@SwampDragons

This comment has been minimized.

Copy link
Member

SwampDragons commented Jan 8, 2020

Plus, normally we don't run acceptance tests on every PR, just on releases. So I'll be reworking the organization a bit.

… testing logic; disable acceptance tests (for now) until we can set up a test rig inside of HashiCorp. Regenerate code based on vendoring changes.
@SwampDragons SwampDragons force-pushed the merge-vsphere-builder branch from ca7ebcf to e87aa23 Jan 8, 2020
@azr
azr approved these changes Jan 10, 2020
Copy link
Member

azr left a comment

Nice one ! There are some minor hcl2 related tweaks; other than that LGTM 👍

func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstructure().HCL2Spec() }

func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
c, warnings, errs := NewConfig(raws...)

This comment has been minimized.

Copy link
@azr

azr Jan 10, 2020

Member

Watch out; this needs to change to

Suggested change
c, warnings, errs := NewConfig(raws...)
warnings, errs := b.config.Prepare(raws...)

Because the HCL2 code will cause prepare to be called twice. Once when starting the builder and one in packer core.

)

type Builder struct {
config *Config

This comment has been minimized.

Copy link
@azr

azr Jan 10, 2020

Member
Suggested change
config *Config
config Config

func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
state := new(multistep.BasicStateBag)
state.Put("comm", &b.config.Comm)

This comment has been minimized.

Copy link
@azr

azr Jan 10, 2020

Member

I think this one is never used !


func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
state := new(multistep.BasicStateBag)
state.Put("comm", &b.config.Comm)

This comment has been minimized.

Copy link
@azr

azr Jan 10, 2020

Member

I think this one is also never used

func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstructure().HCL2Spec() }

func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
c, warnings, errs := NewConfig(raws...)

This comment has been minimized.

Copy link
@azr

azr Jan 10, 2020

Member
Suggested change
c, warnings, errs := NewConfig(raws...)
warnings, errs := b.config.Prepare(raws...)
)

type Builder struct {
config *Config

This comment has been minimized.

Copy link
@azr

azr Jan 10, 2020

Member
Suggested change
config *Config
config Config
@@ -0,0 +1,20 @@
<component name="ProjectDictionaryState">

This comment has been minimized.

Copy link
@azr

azr Jan 10, 2020

Member

I think this file can be removed 🤔

@SwampDragons SwampDragons merged commit fac320d into master Jan 15, 2020
18 checks passed
18 checks passed
atlas/website-deploys/packer-www Terraform plan has no changes
Details
ci/circleci: build_darwin Your tests passed on CircleCI!
Details
ci/circleci: build_freebsd Your tests passed on CircleCI!
Details
ci/circleci: build_linux Your tests passed on CircleCI!
Details
ci/circleci: build_openbsd Your tests passed on CircleCI!
Details
ci/circleci: build_solaris Your tests passed on CircleCI!
Details
ci/circleci: build_windows Your tests passed on CircleCI!
Details
ci/circleci: check-fmt Your tests passed on CircleCI!
Details
ci/circleci: check-generate Your tests passed on CircleCI!
Details
ci/circleci: check-vendor-vs-mod Your tests passed on CircleCI!
Details
ci/circleci: store_artifacts Your tests passed on CircleCI!
Details
ci/circleci: test-darwin Your tests passed on CircleCI!
Details
ci/circleci: test-linux Your tests passed on CircleCI!
Details
ci/circleci: test-windows Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
netlify/packer-www/deploy-preview Deploy preview ready!
Details
@SwampDragons SwampDragons deleted the merge-vsphere-builder branch Jan 15, 2020
@azr

This comment has been minimized.

Copy link
Member

azr commented Jan 16, 2020

Yaaaaay 👍 👍 👍 👍 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.