Merge lp:~robru/bileto/audit-logs into lp:bileto

[Robert Bruce Park]

Expand Comment model to accomodate Audit Logs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:273
http://jenkins.qa.ubuntu.com/job/bileto-ci/66/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bileto-ci/66/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Looks great in staging, db successfully migrated.

review: Approve

[lp:~robru/bileto/audit-logs]

274. By Robert Bruce Park on 2015-09-30

Allow bots with API_TOKEN to set arbitrary comment authors.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/bileto-ci/67/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bileto-ci/67/rebuild

review: Approve (continuous-integration)

=== modified file 'Makefile'
--- Makefile	2015-09-24 15:44:44 +0000
+++ Makefile	2015-09-30 20:05:58 +0000
@@ -21,4 +21,4 @@
 
 install-user:
 	[ -f "$$HOME/bileto.api.token" ] || uuid > "$$HOME/bileto.api.token"
-	# ./db_migrations.sh
+	./db_migrations.sh

=== modified file 'db_migrations.sh'
--- db_migrations.sh	2015-09-02 05:35:33 +0000
+++ db_migrations.sh	2015-09-30 20:05:58 +0000
@@ -4,12 +4,12 @@
 # flask/sqlalchemy migrations bits aren't available for python3 in trusty.
 
 
-CONNECTION=$(tr ':/@' ' ' < $HOME/bileto.postgresql.info)
-USER=$(echo $CONNECTION | awk '{ print $2 }')
-PASSWORD=$(echo $CONNECTION | awk '{ print $3 }')
-HOST=$(echo $CONNECTION | awk '{ print $4 }')
-PORT=$(echo $CONNECTION | awk '{ print $5 }')
-DB=$(echo $CONNECTION | awk '{ print $6 }')
+CONNECTION=$(tr ':/@' ' ' < "$HOME/bileto.postgresql.info")
+USER=$(echo "$CONNECTION" | awk '{ print $2 }')
+PASSWORD=$(echo "$CONNECTION" | awk '{ print $3 }')
+HOST=$(echo "$CONNECTION" | awk '{ print $4 }')
+PORT=$(echo "$CONNECTION" | awk '{ print $5 }')
+DB=$(echo "$CONNECTION" | awk '{ print $6 }')
 
 
 export PGPASSFILE=$(mktemp -t pgpass.XXX)
@@ -25,10 +25,14 @@
     $PG "SELECT pg_terminate_backend($pid);"
 done
 
-$PG "ALTER TABLE request ADD COLUMN job_log varchar(1000) DEFAULT '';" || true
-$PG "ALTER TABLE request ADD COLUMN creator varchar(1000) DEFAULT '';" || true
+$PG "ALTER TABLE comment ADD COLUMN log_url text DEFAULT '';" || true
+$PG "ALTER TABLE comment ADD COLUMN published_versions text DEFAULT '';" || true
+$PG "ALTER TABLE comment ADD COLUMN siloname varchar(1000) DEFAULT '';" || true
 
 # These ones have succeeded in production and only kept for reference
+# $PG "ALTER TABLE request ADD COLUMN job_log varchar(1000) DEFAULT '';" || true
+# $PG "ALTER TABLE request ADD COLUMN creator varchar(1000) DEFAULT '';" || true
+
 # for column in status sources search; do
 #     $PG "ALTER TABLE request ALTER COLUMN $column SET DATA TYPE text;"
 # done

=== modified file 'tests/test_v1.py'
--- tests/test_v1.py	2015-09-30 18:26:56 +0000
+++ tests/test_v1.py	2015-09-30 20:05:58 +0000
@@ -481,6 +481,26 @@
         self.assertEqual(data['request_id'], 1)
         self.assertEqual(data['text'], 'all systems go')
 
+    @patch('tickets.v1.API_TOKEN', FAKE_TOKEN)
+    def test_post_comment_by_bot(self):
+        """Ensure jenkins can inject comments with API token."""
+        self.test_create_ticket('alpha')
+        with self.app.session_transaction() as sesh:
+            sesh.update(teams='', nickname='')
+        ret = self.app.post(
+            '/v1/comment?token=faken',
+            data=json.dumps(dict(
+                request_id=1, author='job starter', text='all systems go')),
+            content_type='application/json')
+        self.assertEqual(ret.status_code, 201)
+        self.assertEqual(Comment.query.get(1).text, 'all systems go')
+        ret = self.app.get('/v1/tickets')
+        data = parse(ret.data)['requests'][0]['comments'][0]
+        self.assertEqual(data['author'], 'job starter')
+        self.assertEqual(data['id'], 1)
+        self.assertEqual(data['request_id'], 1)
+        self.assertEqual(data['text'], 'all systems go')
+
     @patch('tickets.v1.LOGFILE', FAKE_LOG)
     def test_errors(self):
         """Ensure we can read the log file."""

=== modified file 'tickets/models.py'
--- tickets/models.py	2015-09-30 18:42:12 +0000
+++ tickets/models.py	2015-09-30 20:05:58 +0000
@@ -217,4 +217,8 @@
     text = db.Column(db.Text, default='')
     date = db.Column(db.DateTime, default=right_now)
 
+    log_url = db.Column(db.Text, default='')
+    published_versions = db.Column(db.Text, default='')
+    siloname = db.Column(db.String(CHAR_MAX), default='')
+
     verboten = ('id', 'date')

=== modified file 'tickets/v1.py'
--- tickets/v1.py	2015-09-30 18:26:56 +0000
+++ tickets/v1.py	2015-09-30 20:05:58 +0000
@@ -222,7 +222,8 @@
     """Create a new comment."""
     authenticate()
     assert_json()
-    request.json['author'] = session['nickname']
+    if not check_api_token():
+        request.json['author'] = session['nickname']
     comment = Comment(**request.json)
     db.session.add(comment)
     db.session.commit()