From 5e5ecdb75e2ea9123979e3a21b80f95645e61038 Mon Sep 17 00:00:00 2001
From: Tobias Henkel <tobias.henkel@bmw.de>
Date: Tue, 31 Jul 2018 22:39:10 +0200
Subject: [PATCH] Compress svg graphics during swift upload

SVG graphics are xml based and thus good compressible so do that.

Change-Id: Ic985ed2e43f29cfe7c6500ac596b4fdc2f44e9b0
---
 .../library/test-fixtures/logs/controller/cpu-load.svg      | 3 +++
 .../wip-upload-logs-swift/library/test_zuul_swift_upload.py | 6 ++++++
 roles/wip-upload-logs-swift/library/zuul_swift_upload.py    | 1 +
 3 files changed, 10 insertions(+)
 create mode 100644 roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg

diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg b/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg
new file mode 100644
index 000000000..01a940a25
--- /dev/null
+++ b/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg>
+</svg>
diff --git a/roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py b/roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py
index 9b59593aa..60aa31941 100644
--- a/roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py
+++ b/roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py
@@ -60,6 +60,7 @@ class TestFileList(unittest.TestCase):
             ('job-output.json', 'application/json', None),
             ('controller/subdir', 'application/directory', None),
             ('controller/compressed.gz', 'text/plain', 'gzip'),
+            ('controller/cpu-load.svg', 'image/svg+xml', None),
             ('controller/journal.xz', 'text/plain', 'xz'),
             ('controller/service_log.txt', 'text/plain', None),
             ('controller/syslog', 'text/plain', None),
@@ -80,6 +81,7 @@ class TestFileList(unittest.TestCase):
             ('logs/job-output.json', 'application/json', None),
             ('logs/controller/subdir', 'application/directory', None),
             ('logs/controller/compressed.gz', 'text/plain', 'gzip'),
+            ('logs/controller/cpu-load.svg', 'image/svg+xml', None),
             ('logs/controller/journal.xz', 'text/plain', 'xz'),
             ('logs/controller/service_log.txt', 'text/plain', None),
             ('logs/controller/syslog', 'text/plain', None),
@@ -115,6 +117,7 @@ class TestFileList(unittest.TestCase):
             ('logs/index.html', 'text/html', None),
             ('logs/controller/subdir', 'application/directory', None),
             ('logs/controller/compressed.gz', 'text/plain', 'gzip'),
+            ('logs/controller/cpu-load.svg', 'image/svg+xml', None),
             ('logs/controller/journal.xz', 'text/plain', 'xz'),
             ('logs/controller/service_log.txt', 'text/plain', None),
             ('logs/controller/syslog', 'text/plain', None),
@@ -161,6 +164,7 @@ class TestFileList(unittest.TestCase):
             ('index.html', 'text/html', None),
             ('controller/subdir', 'application/directory', None),
             ('controller/compressed.gz', 'text/plain', 'gzip'),
+            ('controller/cpu-load.svg', 'image/svg+xml', None),
             ('controller/journal.xz', 'text/plain', 'xz'),
             ('controller/service_log.txt', 'text/plain', None),
             ('controller/syslog', 'text/plain', None),
@@ -211,6 +215,7 @@ class TestFileList(unittest.TestCase):
             ('index.html', 'text/html', None),
             ('controller/subdir', 'application/directory', None),
             ('controller/compressed.gz', 'text/plain', 'gzip'),
+            ('controller/cpu-load.svg', 'image/svg+xml', None),
             ('controller/journal.xz', 'text/plain', 'xz'),
             ('controller/service_log.txt', 'text/plain', None),
             ('controller/syslog', 'text/plain', None),
@@ -264,6 +269,7 @@ class TestFileList(unittest.TestCase):
             ('index.html', 'text/html', None),
             ('controller/subdir', 'application/directory', None),
             ('controller/compressed.gz', 'text/plain', 'gzip'),
+            ('controller/cpu-load.svg', 'image/svg+xml', None),
             ('controller/journal.xz', 'text/plain', 'xz'),
             ('controller/service_log.txt', 'text/plain', None),
             ('controller/syslog', 'text/plain', None),
diff --git a/roles/wip-upload-logs-swift/library/zuul_swift_upload.py b/roles/wip-upload-logs-swift/library/zuul_swift_upload.py
index e005b8a30..de17a2533 100755
--- a/roles/wip-upload-logs-swift/library/zuul_swift_upload.py
+++ b/roles/wip-upload-logs-swift/library/zuul_swift_upload.py
@@ -413,6 +413,7 @@ class Uploader(object):
         # text sub type.
         compress_types = [
             'application/json',
+            'image/svg+xml',
         ]
         if mimetype in compress_types:
             return True