Merge remote-tracking branch 'origin/master' into gitbase-0.18

Signed-off-by: Carlos Martín <[email protected]>

Author: carlosms

.drone.yml

@@ -31,6 +31,7 @@ helm_deploy: &helm_deploy
   skip_tls_verify: true
   helm_repos: srcd-charts=https://src-d.github.io/charts/
   chart: srcd-charts/gitbase-web
+  chart-version: 0.5.0
   release: gp
   tiller_ns: kube-system
   wait: true
@@ -63,8 +64,8 @@ pipeline:
     <<: *helm_deploy
     prefix: STG
     secrets: [ STG_API_SERVER, STG_KUBERNETES_TOKEN ]
-    values: gitbaseWeb.image.tag=commit-${DRONE_COMMIT_SHA:0:7},ingress.globalStaticIpName=gitbase-playground-staging,ingress.hostname=gitbase-playground-staging.srcd.run
-    values_files: [.helm-staging.yml]
+    values: gitbaseWeb.image.tag=commit-${DRONE_COMMIT_SHA:0:7}
+    values_files: [ .helm-defaults.yml, .helm-staging.yml]
     when:
       branch: [master]
       event: [push]

.helm-defaults.yml

@@ -0,0 +1,72 @@
+service:
+  type: NodePort
+  port: 8080
+
+bblfshdServer:
+  image:
+    repository: bblfsh/bblfshd
+    tag: v2.10.0
+    pullPolicy: IfNotPresent
+  drivers:
+    install: true
+    languages:
+      python:
+        repository: bblfsh/python-driver
+        tag: v2.4.0
+      cpp:
+        repository: bblfsh/cpp-driver
+        tag: v0.3.0
+      java:
+        repository: bblfsh/java-driver
+        tag: v2.3.0
+      php:
+        repository: bblfsh/php-driver
+        tag: v2.4.0
+      ruby:
+        repository: bblfsh/ruby-driver
+        tag: v2.4.0
+      javascript:
+        repository: bblfsh/javascript-driver
+        tag: v2.3.0
+      bash:
+        repository: bblfsh/bash-driver
+        tag: v2.1.0
+      go:
+        repository: bblfsh/go-driver
+        tag: v2.3.0
+
+gitbaseServer:
+  # commit defaults to HEAD unless given
+  repositories:
+    go-git:
+      url: https://github.com/src-d/go-git.git
+      #commit: v4.4.0
+    gitbase:
+      url: https://github.com/src-d/gitbase.git
+    gitbase-web:
+      url: https://github.com/src-d/gitbase-web.git
+    bblfshd:
+      url: https://github.com/bblfsh/bblfshd.git
+    siva-java:
+      url: https://github.com/src-d/siva-java.git
+  image:
+    repository: srcd/gitbase
+    tag: v0.17.1
+    pullPolicy: IfNotPresent
+  squashEnable: "true"
+  readonly: "true"
+
+nodeSelector:
+  cloud.google.com/gke-nodepool: default-pool
+
+affinity:
+   podAntiAffinity:
+     requiredDuringSchedulingIgnoredDuringExecution:
+     - labelSelector:
+        matchExpressions:
+         - key: app
+           operator: In
+           values:
+        #if the chart name is changed or a nameOverride is used, this value has to be changed to the new name.
+           - gitbase-web
+       topologyKey: kubernetes.io/hostname

.helm-staging.yml

@@ -1,53 +1,13 @@
-bblfshdServer:
-  image:
-    repository: bblfsh/bblfshd
-    tag: v2.9.0
-    pullPolicy: IfNotPresent
-  drivers:
-    install: true
-    languages:
-      python:
-        repository: bblfsh/python-driver
-        tag: v2.3.0
-      java:
-        repository: bblfsh/java-driver
-        tag: v2.2.0
-      php:
-        repository: bblfsh/php-driver
-        tag: v2.3.0
-      ruby:
-        repository: bblfsh/ruby-driver
-        tag: v2.3.0
-      javascript:
-        repository: bblfsh/javascript-driver
-        tag: v2.2.0
-      bash:
-        repository: bblfsh/bash-driver
-        tag: v1.1.1
-      go:
-        repository: bblfsh/go-driver
-        tag: v2.2.0
-
-gitbaseServer:
-  # commit defaults to HEAD unless given
-  repositories:
-    go-git:
-      url: https://github.com/src-d/go-git.git
-      #commit: v4.4.0
-    gitbase:
-      url: https://github.com/src-d/gitbase.git
-    gitbase-web:
-      url: https://github.com/src-d/gitbase-web.git
-    bblfshd:
-      url: https://github.com/bblfsh/bblfshd.git
-    siva-java:
-      url: https://github.com/src-d/siva-java.git
-  image:
-    repository: srcd/gitbase
-    tag: v0.17.1
-    pullPolicy: IfNotPresent
-  squashEnable: "true"
-  readonly: "true"
-
-nodeSelector:
-  cloud.google.com/gke-nodepool: default-pool
+ingress:
+    enabled: true
+    annotations:
+      kubernetes.io/ingress.class: gce
+      kubernetes.io/tls-acme: "true"
+      kubernetes.io/ingress.global-static-ip-name: gitbase-playground-staging
+    path: /*
+    hosts:
+      - gitbase-playground-staging.srcd.run
+    tls:
+      - secretName: gitbase-playground-staging-srcd-run-tls
+        hosts:
+          - gitbase-playground-staging.srcd.run

docker-compose.yml

@@ -18,5 +18,5 @@ services:
     volumes:
       - ${GITBASEPG_REPOS_FOLDER}:/opt/repos
   bblfsh:
-    image: "bblfsh/bblfshd:v2.9.2-drivers"
+    image: "bblfsh/bblfshd:v2.10.0-drivers"
     privileged: true

frontend/src/App.js

@@ -79,16 +79,10 @@ class App extends Component {
 SELECT f.repository_id, f.file_path,
        LANGUAGE(f.file_path, f.blob_content) AS lang, f.blob_content,
        UAST(f.blob_content, LANGUAGE(f.file_path, f.blob_content)) AS uast
-FROM   files AS f
-       JOIN commit_files cf ON
-            f.repository_id=cf.repository_id AND
-            f.file_path=cf.file_path AND
-            f.blob_hash=cf.blob_hash AND
-            f.tree_hash=cf.tree_hash
-       JOIN refs ON
-            cf.repository_id = refs.repository_id AND
-            cf.commit_hash = refs.commit_hash
-WHERE  ref_name = 'HEAD'
+FROM   refs AS r
+       NATURAL JOIN commit_files
+       NATURAL JOIN files AS f
+WHERE  r.ref_name = 'HEAD'
        AND f.file_path REGEXP('.*main.go')`
       },
 

server/service/uast_test.go

@@ -0,0 +1,31 @@
+package service_test
+
+import (
+	"bytes"
+	"encoding/binary"
+	"testing"
+
+	"github.com/src-d/gitbase-web/server/service"
+	"github.com/stretchr/testify/suite"
+)
+
+type UastSuite struct {
+	suite.Suite
+}
+
+func TestUastSuite(t *testing.T) {
+	s := new(UastSuite)
+	suite.Run(t, s)
+}
+
+func (suite *UastSuite) TestNegativeNodeLen() {
+	var nodeLen int32 = -20
+
+	buf := new(bytes.Buffer)
+	err := binary.Write(buf, binary.BigEndian, nodeLen)
+	suite.Require().NoError(err)
+
+	nodes, err := service.UnmarshalUAST(buf.Bytes())
+	suite.Require().Error(err)
+	suite.Require().Nil(nodes)
+}