From b31f8bb0f6bdee6b6c3f6e550e885d70bd19831c Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 1 Jun 2017 11:25:53 -0700 Subject: [PATCH] clean up formatting and add warning to packer push. --- command/push.go | 9 +++++++++ post-processor/atlas/post-processor.go | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/command/push.go b/command/push.go index a0edd6b84..f2432c252 100644 --- a/command/push.go +++ b/command/push.go @@ -177,6 +177,15 @@ func (c *PushCommand) Run(args []string) int { uploadOpts.Builds = make(map[string]*uploadBuildInfo) for _, b := range tpl.Builders { info := &uploadBuildInfo{Type: b.Type} + // todo: remove post-migration + if b.Type == "vagrant" { + c.Ui.Message("\n-----------------------------------------------------------------------------------\n" + + "Warning: Vagrant-related functionality will be moved from Terraform Enterprise into \n" + + "its own product, Vagrant Cloud. This migration is currently planned for June 27th, \n" + + "2017 at 6PM EDT/3PM PDT/10PM UTC. For more information see \n" + + "https://www.vagrantup.com/docs/vagrant-cloud/vagrant-cloud-migration.html\n" + + "-----------------------------------------------------------------------------------\n") + } // Determine if we're artifacting this build for _, pp := range atlasPPs { diff --git a/post-processor/atlas/post-processor.go b/post-processor/atlas/post-processor.go index 28ac35bf1..ad0456c79 100644 --- a/post-processor/atlas/post-processor.go +++ b/post-processor/atlas/post-processor.go @@ -145,9 +145,9 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac // todo: remove/reword after the migration if p.config.Type == "vagrant.box" { ui.Message("\n-----------------------------------------------------------------------------------\n" + - "Warning: Vagrant-related functionality will be moved from Terraform Enterprise into " + - "its own product, Vagrant Cloud. This migration is currently planned for June 27th, " + - "2017 at 6PM EDT/3PM PDT/10PM UTC. For more information see " + + "Warning: Vagrant-related functionality will be moved from Terraform Enterprise into \n" + + "its own product, Vagrant Cloud. This migration is currently planned for June 27th, \n" + + "2017 at 6PM EDT/3PM PDT/10PM UTC. For more information see \n" + "https://www.vagrantup.com/docs/vagrant-cloud/vagrant-cloud-migration.html\n" + "-----------------------------------------------------------------------------------\n") }