Automated releases + FDK version header (#82)

* user agent added

* fixing header assignment

* fix pep8 check

* auto-release

* chmod +x to release image script

* fix rebase conflicts

* remove version placement from headers.py

Author: denismakogon

fdk/constants.py

@@ -24,6 +24,7 @@
 FN_HTTP_PREFIX = "Fn-Http-H-"
 FN_HTTP_STATUS = "Fn-Http-Status"
 FN_DEADLINE = "fn-deadline"
+FN_FDK_VERSION = "Fn-Fdk-Version"
 FN_HTTP_REQUEST_URL = "fn-http-request-url"
 FN_CALL_ID = "fn-call-id"
 FN_HTTP_METHOD = "fn-http-method"

fdk/headers.py

@@ -31,11 +31,13 @@ def encap_headers(headers, status=None):
     if headers is not None:
         for k, v in headers.items():
             if (k == constants.CONTENT_TYPE or
+                    k == constants.FN_FDK_VERSION or
                     k.startswith(constants.FN_HTTP_PREFIX)):
                 new_headers[k] = v
             else:
                 new_headers[constants.FN_HTTP_PREFIX + k] = v
 
     if status is not None:
         new_headers[constants.FN_HTTP_STATUS] = str(status)
+
     return new_headers

fdk/response.py

@@ -13,6 +13,8 @@
 #    under the License.
 
 from fdk import context
+from fdk import constants
+from fdk import version
 
 
 class Response(object):
@@ -37,6 +39,7 @@ def __init__(self, ctx: context.InvokeContext,
         self.response_data = response_data if response_data else ""
         if headers is None:
             headers = {}
+        headers.update({constants.FN_FDK_VERSION: version.VERSION})
         ctx.SetResponseHeaders(headers, status_code)
         self.ctx = ctx
 

fdk/tests/test_http_stream.py

@@ -19,6 +19,7 @@
 from fdk import constants
 from fdk import event_handler
 from fdk import fixtures
+from fdk import version
 
 from fdk.tests import funcs
 
@@ -32,6 +33,7 @@ async def test_override_content_type():
     assert 200 == status
     assert "OK" == content
     assert "application/json" in headers.get("Content-Type")
+    assert version.VERSION == headers.get(constants.FN_FDK_VERSION)
 
 
 @pytest.mark.asyncio

fdk/version.py

@@ -0,0 +1 @@
+VERSION = "0.1.4"

release.sh

@@ -1,8 +1,33 @@
-#!/usr/bin/env bash
+#!/bin/bash
+set -ex
 
+# ensure working dir is clean
+git status
+if [[ -z $(git status -s) ]]
+then
+  echo "tree is clean"
+else
+  echo "tree is dirty, please commit changes before running this"
+  exit 1
+fi
 
-git checkout -b v${FDK_VERSION}-stable
-git push origin v${FDK_VERSION}-stable
-PBR_VERSION=${FDK_VERSION} python setup.py sdist bdist_wheel
-twine upload dist/fdk-${FDK_VERSION}*
-git checkout master
+git pull
+
+version_file="fdk/version.py"
+current_version=$(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" ${version_file})
+new_version=$(docker run --rm marcelocorreia/semver semver -c -i patch ${current_version})
+
+echo "Current version: $current_version"
+echo "New version: $new_version"
+
+sed -i '' -e 's/'"$current_version"'/'"$new_version"'/g' fdk/version.py
+
+PBR_VERSION=${new_version} python setup.py sdist bdist_wheel
+twine upload -u ${FN_PYPI_USER} -p ${FN_PYPI_PSWD} dist/fdk-${new_version}*
+
+tag="$new_version"
+git add -u
+git commit -m "FDK Python: $new_version release [skip ci]"
+git tag -f -a $tag -m "version $new_version"
+git push
+git push origin $tag