Skip to content
This repository has been archived by the owner on May 24, 2019. It is now read-only.

Commit

Permalink
Revert "Add a __version__ endpoint #185"
Browse files Browse the repository at this point in the history
This reverts commit 9ba7819.

Conflicts:
	README.md
	leaderboard/home/tests.py
	leaderboard/home/urls.py
	leaderboard/home/views.py
	leaderboard/settings.py
  • Loading branch information
jaredlockhart committed Jan 26, 2016
1 parent ca5fd38 commit d20a3e6
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 47 deletions.
27 changes: 0 additions & 27 deletions leaderboard/home/tests.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import json

import mock
from django.core.urlresolvers import reverse
from django.db import OperationalError
Expand All @@ -13,31 +11,6 @@ def test_landing_page_renders(self):
self.assertEqual(response.status_code, 200)


class VersionViewTests(TestCase):

def test_version_view_returns_git_settings(self):
git_settings = {
'GIT_COMMIT': 'abcdef',
'GIT_SOURCE': 'git/repo/path',
'GIT_TAG': 'test-0.1',
'GIT_VERSION': '0.1',
}

with self.settings(**git_settings):
response = self.client.get(reverse('home-version'))

self.assertEqual(response.status_code, 200)
self.assertEqual(response.content_type, 'application/json')

version_data = json.loads(response.content)
self.assertEqual(version_data, {
'commit': git_settings['GIT_COMMIT'],
'source': git_settings['GIT_SOURCE'],
'tag': git_settings['GIT_TAG'],
'version': git_settings['GIT_VERSION'],
})


class HearbeatViewTests(TestCase):

def test_heartbeat_view_returns_200_if_able_to_reach_db(self):
Expand Down
3 changes: 1 addition & 2 deletions leaderboard/home/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from django.conf.urls import url

from leaderboard.home.views import LandingView, VersionView, HeartbeatView
from leaderboard.home.views import LandingView, HeartbeatView

urlpatterns = [
url('^$', LandingView.as_view(), name='home-landing'),
url('^__version__$', VersionView.as_view(), name='home-version'),
url('^__heartbeat__$', HeartbeatView.as_view(), name='home-heartbeat'),
]
12 changes: 0 additions & 12 deletions leaderboard/home/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from django.conf import settings
from django.db import connections, OperationalError
from django.views.generic import TemplateView
from rest_framework.response import Response
Expand All @@ -9,17 +8,6 @@ class LandingView(TemplateView):
template_name = 'home/landing.html'


class VersionView(APIView):

def get(self, request):
return Response({
'commit': settings.GIT_COMMIT,
'source': settings.GIT_SOURCE,
'tag': settings.GIT_TAG,
'version': settings.GIT_VERSION,
}, content_type='application/json')


class HeartbeatView(APIView):

def get(self, request):
Expand Down
6 changes: 0 additions & 6 deletions leaderboard/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,6 @@
# FXA Shared Settings
FXA_SCOPE = 'profile leaderboard'

# Git version info
GIT_COMMIT = os.environ.get('GIT_COMMIT', 'UNKNOWN')
GIT_SOURCE = os.environ.get('GIT_SOURCE', 'UKNOWN')
GIT_TAG = os.environ.get('GIT_TAG', 'UNKNOWN')
GIT_VERSION = os.environ.get('GIT_VERSION', 'UNKNOWN')

# Google Analytics
GOOGLE_ANALYTICS_ID = 'Unknown'

Expand Down

0 comments on commit d20a3e6

Please sign in to comment.