From 5d420ce1c1442a331c254daba5c0dc4559e75333 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 6 Dec 2013 18:09:05 -0800
Subject: [PATCH] Revert "Merge pull request #663 from ktruong7/public-AMI"

This reverts commit b2fc77870b825403ea068ba63f66ac28c76b3e88, reversing
changes made to 4789d3acc8937757ee7a430199bbc39671ba93c7.

This is already possible by setting groups.
---
 builder/amazon/chroot/builder.go                    |  1 -
 builder/amazon/common/ami_config.go                 |  2 --
 builder/amazon/common/step_modify_ami_attributes.go | 10 ----------
 builder/amazon/ebs/builder.go                       |  1 -
 builder/amazon/instance/builder.go                  |  1 -
 5 files changed, 15 deletions(-)

diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go
index f220759d2..e898f4173 100644
--- a/builder/amazon/chroot/builder.go
+++ b/builder/amazon/chroot/builder.go
@@ -202,7 +202,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Description: b.config.AMIDescription,
 			Users:       b.config.AMIUsers,
 			Groups:      b.config.AMIGroups,
-			Visibility:  b.config.AMIVisibility,
 		},
 		&awscommon.StepCreateTags{
 			Tags: b.config.AMITags,
diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go
index 2602c6cf6..50e831c9d 100644
--- a/builder/amazon/common/ami_config.go
+++ b/builder/amazon/common/ami_config.go
@@ -15,7 +15,6 @@ type AMIConfig struct {
 	AMIProductCodes []string          `mapstructure:"ami_product_codes"`
 	AMIRegions      []string          `mapstructure:"ami_regions"`
 	AMITags         map[string]string `mapstructure:"tags"`
-	AMIVisibility   string            `mapstructure:"ami_visibility"`
 }
 
 func (c *AMIConfig) Prepare(t *packer.ConfigTemplate) []error {
@@ -30,7 +29,6 @@ func (c *AMIConfig) Prepare(t *packer.ConfigTemplate) []error {
 	templates := map[string]*string{
 		"ami_name":        &c.AMIName,
 		"ami_description": &c.AMIDescription,
-		"ami_visibility":  &c.AMIVisibility,
 	}
 
 	errs := make([]error, 0)
diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go
index 1a31459d3..533d4cfd9 100644
--- a/builder/amazon/common/step_modify_ami_attributes.go
+++ b/builder/amazon/common/step_modify_ami_attributes.go
@@ -13,7 +13,6 @@ type StepModifyAMIAttributes struct {
 	Groups       []string
 	ProductCodes []string
 	Description  string
-	Visibility   string
 }
 
 func (s *StepModifyAMIAttributes) Run(state multistep.StateBag) multistep.StepAction {
@@ -27,7 +26,6 @@ func (s *StepModifyAMIAttributes) Run(state multistep.StateBag) multistep.StepAc
 	valid = valid || (s.Users != nil && len(s.Users) > 0)
 	valid = valid || (s.Groups != nil && len(s.Groups) > 0)
 	valid = valid || (s.ProductCodes != nil && len(s.ProductCodes) > 0)
-	valid = valid || s.Visibility == "public"
 
 	if !valid {
 		return multistep.ActionContinue
@@ -61,14 +59,6 @@ func (s *StepModifyAMIAttributes) Run(state multistep.StateBag) multistep.StepAc
 		}
 	}
 
-	if s.Visibility == "public" {
-		group := make([]string, 1)
-		group[0] = "all"
-		options["public ami"] = &ec2.ModifyImageAttribute{
-			AddGroups: group,
-		}
-	}
-
 	for region, ami := range amis {
 		ui.Say(fmt.Sprintf("Modifying attributes on AMI (%s)...", ami))
 		regionconn := ec2.New(ec2conn.Auth, aws.Regions[region])
diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go
index b2193a020..5d68f9470 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -119,7 +119,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Description: b.config.AMIDescription,
 			Users:       b.config.AMIUsers,
 			Groups:      b.config.AMIGroups,
-			Visibility:  b.config.AMIVisibility,
 		},
 		&awscommon.StepCreateTags{
 			Tags: b.config.AMITags,
diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go
index 1c3bd2889..455a7cd01 100644
--- a/builder/amazon/instance/builder.go
+++ b/builder/amazon/instance/builder.go
@@ -225,7 +225,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Users:        b.config.AMIUsers,
 			Groups:       b.config.AMIGroups,
 			ProductCodes: b.config.AMIProductCodes,
-			Visibility:   b.config.AMIVisibility,
 		},
 		&awscommon.StepCreateTags{
 			Tags: b.config.AMITags,