From 844b3333aae02d596061386b5a1a2fbc821950be Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <jaegerandi@gmail.com>
Date: Fri, 2 Feb 2018 18:33:12 +0000
Subject: [PATCH] Revert "Change the list of extensions to a dict"

This reverts commit 146fa7b2e616ec4f2ba15e8445a666a086549cc3.

This does not work yet as planned. Let's revert for now and test properly again.

Change-Id: Idac7e398fe4854769589411f22f7c4ce7cb363f6
---
 roles/stage-output/README.rst      |  7 +++----
 roles/stage-output/tasks/main.yaml | 19 +------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/roles/stage-output/README.rst b/roles/stage-output/README.rst
index 3dd8d37bc..9e5e848dd 100644
--- a/roles/stage-output/README.rst
+++ b/roles/stage-output/README.rst
@@ -31,7 +31,7 @@ intended to be used before output fetching in a base job's post-playbook.
 .. zuul:rolevar:: extensions_to_txt
    :default: null
 
-   A dict of file extensions to be replaced with .txt when staging.
+   A list of file extensions to be replaced with .txt when staging.
    This can be useful to ensure that text files with an extension not
    registered in the web server may be viewed via browser when uploaded
    to a file server.
@@ -43,9 +43,8 @@ intended to be used before output fetching in a base job's post-playbook.
    Example:
 
      extensions_to_txt:
-       conf: True
-       log: True
-       txt: False
+     - conf
+     - log
 
      zuul.conf --(staged as)--> zuul_conf.txt
 
diff --git a/roles/stage-output/tasks/main.yaml b/roles/stage-output/tasks/main.yaml
index 23eb19c14..fefc674ff 100644
--- a/roles/stage-output/tasks/main.yaml
+++ b/roles/stage-output/tasks/main.yaml
@@ -4,26 +4,9 @@
   with_dict: "{{ zuul_copy_output }}"
   register: sources
 
-- name: Build the replace regex when the input is a list
+- name: Build the replace regex
   set_fact:
     extensions_regex: "{{ extensions_to_txt | join('|') | default('__do_not_replace__') }}"
-  when: extensions_to_txt | type_debug == 'list'
-
-- name: Output a warning when input is a list
-  debug:
-    msg: "WARNING: extensions_to_txt is a list, values defined by parents will be overwritten"
-  when: extensions_to_txt | type_debug == 'list'
-
-- name: Build a list when replace regex is a dict
-  set_fact:
-    extensions_regex: "{{ extensions_regex | default('___') }}|{{ item.key }}"
-  with_dict: extensions_to_txt
-  when:
-    - extensions_to_txt | type_debug == 'dict'
-    - item.value == True
-  # NOTE(andreaf) Even if this is only executed for type 'dict', with_dict is
-  # still invoked somehow and it's causing an error when the input is a list
-  ignore_errors: yes
 
 - debug:
     var: extensions_regex