deis / controller

Deis Workflow Controller (API)
https://deis.com
MIT License
41 stars 53 forks source link

fix(controller): Persist ssl.enforce header on service creation #1305

Closed mattk42 closed 6 years ago

mattk42 commented 7 years ago

This is a fix for #1304

deis-admin commented 7 years ago

Thanks for the contribution! Please ensure your commits follow our style guide. This code will be tested once a Deis maintainer reviews it.

mboersma commented 7 years ago

Jenkins, add to whitelist.

mboersma commented 7 years ago

Thanks @mattk42! This needs a rebase and seems to have failed a unit test:

12:42:45 ======================================================================
12:42:45 FAIL: test_config_set_unicode (api.tests.test_config.ConfigTest)
12:42:45 ----------------------------------------------------------------------
12:42:45 Traceback (most recent call last):
12:42:45   File "/usr/local/lib/python3.5/dist-packages/requests_mock/mocker.py", line 222, in inner
12:42:45     return func(*args, **kwargs)
12:42:45   File "/usr/lib/python3.5/unittest/mock.py", line 1157, in patched
12:42:45     return func(*args, **keywargs)
12:42:45   File "/test/rootfs/api/tests/test_config.py", line 252, in test_config_set_unicode
12:42:45     self.assertEqual(response.status_code, 201, response.data)
12:42:45 AssertionError: 400 != 201 : {'detail': 'duplicate key value violates unique constraint "api_release_app_id_version_e492eaee_uniq"\nDETAIL:  Key (app_id, version)=(17a9703c-d248-4337-9fad-4d39ee1e5f1c, 3) already exists.\n'}
vdice commented 7 years ago

ping @mattk42 -- any chance to rebase and potentially fix up test(s)?

mattk42 commented 7 years ago

Sorry, lost track of this. Will take a look tonight.

vdice commented 7 years ago

Thanks @mattk42 !

fyi: e2e actually passed (ran right up to the 30 min timeout, but all specs passed): https://ci.deis.io/job/workflow-chart-e2e/391/console

codecov-io commented 6 years ago

Codecov Report

Merging #1305 into master will decrease coverage by 0.11%. The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1305      +/-   ##
==========================================
- Coverage   86.99%   86.88%   -0.12%     
==========================================
  Files          45       45              
  Lines        3929     3941      +12     
  Branches      681      682       +1     
==========================================
+ Hits         3418     3424       +6     
- Misses        339      346       +7     
+ Partials      172      171       -1