Apply labels to the docker container as well as the marathon app when using the default template (#130)

* Apply labels to the docker container as well as the marathon app when using the default template

* Remove leftover print

Author: paddycarey

shpkpr/resources/templates/chronos/default/job.json.tmpl

@@ -36,6 +36,13 @@
         "type": "DOCKER",
         {# The name/tag of the Docker image to use. #}
         "image": "{{DOCKER_REPOTAG}}",
+        "parameters": [
+            {% block docker_labels %}
+            {% for key, value in _all_env|filter_items("LABEL_", strip_prefix=True) %}
+                {"key": "label", "value": "{{key|slugify}}={{value}}"}{% if not loop.last %},{% endif %}
+            {% endfor %}
+            {% endblock %}
+        ],
         "network": "BRIDGE"
     },
     {# The number of CPU shares this job needs. #}

shpkpr/resources/templates/marathon/default/standard.json.tmpl

@@ -124,6 +124,13 @@
             ],
             {% endif %}
             {% endblock %}
+            "parameters": [
+                {% block docker_labels %}
+                {% for key, value in _all_env|filter_items("LABEL_", strip_prefix=True) %}
+                    {"key": "label", "value": "{{key|slugify}}={{value}}"}{% if not loop.last %},{% endif %}
+                {% endfor %}
+                {% endblock %}
+            ],
             "network": "BRIDGE"
         }
     },

tests/commands/test_cmd_apps_deploy.py

@@ -150,3 +150,44 @@ def test_strategy_bluegreen(runner):
     result = runner(['apps', 'deploy', '--dry-run', '--strategy', 'bluegreen', '--template', _tmpl_path], env=env)
 
     assert result.exit_code == 0
+
+
+@responses.activate
+@mock.patch('shpkpr.marathon.MarathonDeployment.wait')
+def test_default_template(mock_deployment_wait, runner, json_fixture):
+    responses.add(responses.PUT,
+                  'http://marathon.somedomain.com:8080/v2/apps/test-app',
+                  status=201,
+                  json=json_fixture("deployment"),
+                  match_querystring=True)
+    mock_deployment_wait.return_value = True
+
+    env = {
+        'SHPKPR_MARATHON_URL': "http://marathon.somedomain.com:8080",
+        'SHPKPR_MARATHON_APP_ID': 'test-app',
+        'SHPKPR_DOCKER_REPOTAG': 'goexample/outyet:latest',
+    }
+    result = runner(['apps', 'deploy'], env=env)
+
+    assert result.exit_code == 0
+
+
+@responses.activate
+@mock.patch('shpkpr.marathon.MarathonDeployment.wait')
+def test_default_template_labels(mock_deployment_wait, runner, json_fixture):
+    responses.add(responses.PUT,
+                  'http://marathon.somedomain.com:8080/v2/apps/test-app',
+                  status=201,
+                  json=json_fixture("deployment"),
+                  match_querystring=True)
+    mock_deployment_wait.return_value = True
+
+    env = {
+        'SHPKPR_MARATHON_URL': "http://marathon.somedomain.com:8080",
+        'SHPKPR_MARATHON_APP_ID': 'test-app',
+        'SHPKPR_DOCKER_REPOTAG': 'goexample/outyet:latest',
+        'SHPKPR_LABEL_SOME_LABEL': 'somevalue',
+    }
+    result = runner(['apps', 'deploy'], env=env)
+
+    assert result.exit_code == 0

tests/commands/test_cmd_cron.py

@@ -59,6 +59,43 @@ def test_set(mock_chronos_add, mock_chronos_list, runner, json_fixture):
     assert result.exit_code == 0
 
 
+@mock.patch("shpkpr.cli.options.ChronosClient.list")
+@mock.patch("shpkpr.cli.options.ChronosClient.add")
+def test_set_default_template(mock_chronos_add, mock_chronos_list, runner, json_fixture):
+    mock_chronos_list.return_value = []
+    mock_chronos_add.return_value = True
+
+    result = runner(['cron', 'set'], env={
+        'SHPKPR_CHRONOS_URL': "chronos.somedomain.com:4400",
+        'SHPKPR_CHRONOS_JOB_NAME': 'shpkpr-test-job',
+        'SHPKPR_CHRONOS_OWNER': 'shpkpr-test@example.com',
+        'SHPKPR_CHRONOS_CMD': 'someprogram --run',
+        'SHPKPR_DOCKER_REPOTAG': 'goexample/outyet:latest',
+    })
+
+    assert mock_chronos_add.called
+    assert result.exit_code == 0
+
+
+@mock.patch("shpkpr.cli.options.ChronosClient.list")
+@mock.patch("shpkpr.cli.options.ChronosClient.add")
+def test_set_default_template_labels(mock_chronos_add, mock_chronos_list, runner, json_fixture):
+    mock_chronos_list.return_value = []
+    mock_chronos_add.return_value = True
+
+    result = runner(['cron', 'set'], env={
+        'SHPKPR_CHRONOS_URL': "chronos.somedomain.com:4400",
+        'SHPKPR_CHRONOS_JOB_NAME': 'shpkpr-test-job',
+        'SHPKPR_CHRONOS_OWNER': 'shpkpr-test@example.com',
+        'SHPKPR_CHRONOS_CMD': 'someprogram --run',
+        'SHPKPR_LABEL_SOME_LABEL': 'some-value',
+        'SHPKPR_DOCKER_REPOTAG': 'goexample/outyet:latest',
+    })
+
+    assert mock_chronos_add.called
+    assert result.exit_code == 0
+
+
 @mock.patch("shpkpr.cli.options.ChronosClient.list")
 @mock.patch("shpkpr.cli.options.ChronosClient.add")
 def test_set_multiple(mock_chronos_add, mock_chronos_list, runner):