From b8598748bc8e7c9061611d9231b92d5fa291ea73 Mon Sep 17 00:00:00 2001
From: Brian Coca <brian.coca+git@gmail.com>
Date: Wed, 1 Jun 2016 15:10:08 -0400
Subject: [PATCH] Revert "Add prefixing and suffixing fuctionality to assemble"

This reverts commit 4c386dba565109d971e88be961abe93d700939b3.
keeping in sync with main repo revert
---
 files/assemble.py | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/files/assemble.py b/files/assemble.py
index 04af4016df7..641c943026c 100644
--- a/files/assemble.py
+++ b/files/assemble.py
@@ -62,18 +62,6 @@ options:
     version_added: "1.4"
     required: false
     default: null
-  header:
-    description:
-      - A line to insert before the fragments
-    version_added: "2.2"
-    required: false
-    default: null
-  footer:
-    description:
-      - A line to insert after the fragments
-    version_added: "2.2"
-    required: false
-    default: null
   remote_src:
     description:
       - If False, it will search for src at originating/master machine, if True it will
@@ -118,26 +106,18 @@ EXAMPLES = '''
 
 # Copy a new "sshd_config" file into place, after passing validation with sshd
 - assemble: src=/etc/ssh/conf.d/ dest=/etc/ssh/sshd_config validate='/usr/sbin/sshd -t -f %s'
-
-# Create a PHP configuration file with opening and closing PHP tags
-- assemble: src=/etc/someapp/fragments dest=/etc/someapp/someapp.php header='<?php' footer='?>'
 '''
 
 # ===========================================
 # Support method
 
-def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None, ignore_hidden=False, header=None, footer=None):
+def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None, ignore_hidden=False):
     ''' assemble a file from a directory of fragments '''
     tmpfd, temp_path = tempfile.mkstemp()
     tmp = os.fdopen(tmpfd,'w')
     delimit_me = False
     add_newline = False
 
-    if header is not None:
-        if not header.endswith('\n'):
-            header += '\n'
-        tmp.write(header)
-
     for f in sorted(os.listdir(src_path)):
         if compiled_regexp and not compiled_regexp.search(f):
             continue
@@ -168,13 +148,6 @@ def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None, igno
         else:
             add_newline = True
 
-    if footer is not None:
-        if add_newline:  # last fragment did not end with \n
-            footer = '\n' + footer
-        if not footer.endswith('\n'):
-            footer += '\n'
-        tmp.write(footer)
-
     tmp.close()
     return temp_path
 
@@ -199,8 +172,6 @@ def main():
         argument_spec = dict(
             src = dict(required=True),
             delimiter = dict(required=False),
-            header = dict(required=False),
-            footer = dict(required=False),
             dest = dict(required=True),
             backup=dict(default=False, type='bool'),
             remote_src=dict(default=False, type='bool'),
@@ -218,8 +189,6 @@ def main():
     dest      = os.path.expanduser(module.params['dest'])
     backup    = module.params['backup']
     delimiter = module.params['delimiter']
-    header    = module.params['header']
-    footer    = module.params['footer']
     regexp    = module.params['regexp']
     compiled_regexp = None
     ignore_hidden = module.params['ignore_hidden']
@@ -242,7 +211,7 @@ def main():
     if validate and "%s" not in validate:
         module.fail_json(msg="validate must contain %%s: %s" % validate)
 
-    path = assemble_from_fragments(src, delimiter, compiled_regexp, ignore_hidden, header, footer)
+    path = assemble_from_fragments(src, delimiter, compiled_regexp, ignore_hidden)
     path_hash = module.sha1(path)
     result['checksum'] = path_hash
 
@@ -283,3 +252,4 @@ def main():
 from ansible.module_utils.basic import *
 
 main()
+