From 0880d448f06fca9338d26b35a1c183bf1fe13d76 Mon Sep 17 00:00:00 2001
From: Chris Bednarski <banzaimonkey@gmail.com>
Date: Thu, 18 Jun 2015 14:01:00 -0700
Subject: [PATCH] Cleanup some debug code and reorganize config struct

---
 post-processor/compress/post-processor.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/post-processor/compress/post-processor.go b/post-processor/compress/post-processor.go
index 0ecc7db86..769f21fb2 100644
--- a/post-processor/compress/post-processor.go
+++ b/post-processor/compress/post-processor.go
@@ -21,13 +21,17 @@ import (
 
 type Config struct {
 	common.PackerConfig `mapstructure:",squash"`
-	OutputPath          string `mapstructure:"output"`
-	CompressionLevel    int    `mapstructure:"compression_level"`
-	KeepInputArtifact   bool   `mapstructure:"keep_input_artifact"`
-	Archive             string
-	Algorithm           string
-	UsingDefault        bool
-	ctx                 *interpolate.Context
+
+	// Fields from config file
+	OutputPath        string `mapstructure:"output"`
+	CompressionLevel  int    `mapstructure:"compression_level"`
+	KeepInputArtifact bool   `mapstructure:"keep_input_artifact"`
+
+	// Derived fields
+	Archive   string
+	Algorithm string
+
+	ctx *interpolate.Context
 }
 
 type PostProcessor struct {
@@ -54,8 +58,6 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
 		},
 	}, raws...)
 
-	fmt.Printf("CompressionLevel: %d\n", p.config.CompressionLevel)
-
 	errs := new(packer.MultiError)
 
 	if p.config.OutputPath == "" {
@@ -81,7 +83,6 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
 		p.config.CompressionLevel = pgzip.DefaultCompression
 	}
 
-	fmt.Printf("CompressionLevel: %d\n", p.config.CompressionLevel)
 	for key, ptr := range templates {
 		if *ptr == "" {
 			errs = packer.MultiErrorAppend(