Merge branch 'master' of github.com:rudderlabs/rudder-server into emp…

…ty_load_files

Makefile

@@ -23,7 +23,7 @@ build-sql-migrations: ./services/sql-migrator/migrations_vfsdata.go ## Prepare s
 prepare-build: build-sql-migrations enterprise-prepare-build
 
 ./services/sql-migrator/migrations_vfsdata.go: $(shell find sql/migrations)
-	$(GO) run -tags=dev generate-sql-migrations.go
+	$(GO) run -mod=vendor -tags=dev cmd/generate-migrations/generate-sql-migrations.go
 
 build: prepare-build ## Build rudder-server binary
 	$(eval BUILD_OPTIONS = )
@@ -66,5 +66,4 @@ enterprise-prepare-build: ## Create ./imports/enterprise.go, to link enterprise
 install-tools:
 	# Try install for go 1.16+, fallback to get
 	go install github.com/golang/mock/mockgen@v1.6.0 || \
-	GO111MODULE=on go get github.com/golang/mock/mockgen@v1.6.0 
-
+	GO111MODULE=on go get github.com/golang/mock/mockgen@v1.6.0

build/buildspec.docker.dev.yml

@@ -9,7 +9,7 @@ env:
 phases:
   install:
     runtime-versions:
-      golang: 1.16.8
+      golang: 1.16
   pre_build:
     commands:
       - env

build/buildspec.docker.master.yml

@@ -9,7 +9,7 @@ env:
 phases:
   install:
     runtime-versions:
-      golang: 1.16.8
+      golang: 1.16
   pre_build:
     commands:
       - docker login --username rudderlabs --password $dockerhub_passwd
@@ -43,7 +43,7 @@ phases:
 reports:
   GinkgoUnitTestReports:
     files:
-      - '**/junit_*.xml'
+      - "**/junit_*.xml"
 artifacts:
   files:
     - "**/*"

build/buildspec.docker.saas.yml

@@ -8,7 +8,7 @@ env:
 phases:
   install:
     runtime-versions:
-      golang: 1.16.8
+      golang: 1.16
   pre_build:
     commands:
       - docker login --username rudderlabs --password $dockerhub_passwd

build/buildspec.docker.yml

@@ -8,7 +8,7 @@ env:
 phases:
   install:
     runtime-versions:
-      golang: 1.16.8
+      golang: 1.16
   pre_build:
     commands:
       - docker login --username rudderlabs --password $dockerhub_passwd
@@ -29,7 +29,7 @@ phases:
       # Build Enterprise version
       - make enterprise-init
       - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 LDFLAGS="-s -w -X main.version=$VERSION -X main.commit=$CODEBUILD_RESOLVED_SOURCE_VERSION -X main.buildDate=$DATE -X main.builtBy=codebuild-$CODEBUILD_BUILD_ID " make build
-      - docker build -t rudderstack/rudder-server-enterprise:$VERSION -f build/Dockerfile-aws . 
+      - docker build -t rudderstack/rudder-server-enterprise:$VERSION -f build/Dockerfile-aws .
   post_build:
     commands:
       - docker push rudderlabs/rudder-server:$VERSION

build/buildspec.e2e-tests.yml

@@ -8,7 +8,7 @@ env:
 phases:
   install:
     runtime-versions:
-      golang: 1.16.8
+      golang: 1.16
   pre_build:
     commands:
       - mkdir -p ~/.ssh

build/buildspec.pr.yml

@@ -8,9 +8,9 @@ env:
 phases:
   install:
     runtime-versions:
-      golang: 1.16.8
+      golang: 1.16
     commands:
-      - apt-get install jq 
+      - apt-get install jq
   pre_build:
     commands:
       - env
@@ -21,7 +21,7 @@ phases:
       - eval "$(ssh-agent -s)"
       - ssh-add ~/.ssh/ssh_key
       - (cd && go get github.com/onsi/ginkgo/ginkgo)
-      - (cd && go get github.com/golang/mock/mockgen)        
+      - (cd && go get github.com/golang/mock/mockgen)
   build:
     commands:
       - export GO111MODULE=on
@@ -60,4 +60,4 @@ reports:
       - "**/junit_*.xml"
 artifacts:
   files:
-    - "**/*"
+    - "**/*"

build/buildspec.release.yml

@@ -8,7 +8,7 @@ env:
 phases:
   install:
     runtime-versions:
-      golang: 1.16.8
+      golang: 1.16
   pre_build:
     commands:
       - docker login --username rudderlabs --password $dockerhub_passwd
@@ -23,7 +23,7 @@ phases:
       - DATE=$(date "+%F,%T")
       - echo date.. $DATE
       - TAG=$CODEBUILD_WEBHOOK_TRIGGER
-      - echo tag.. $TAG 
+      - echo tag.. $TAG
       - VERSION=$(echo $TAG | cut -d "/" -f 2)
       - echo version.. $VERSION
       # Build Open source version
@@ -39,4 +39,4 @@ phases:
       - docker push rudderstack/rudder-server-enterprise:$VERSION
 artifacts:
   files:
-    - "**/*"
+    - "**/*"

build/buildspec.saas.yml

@@ -8,7 +8,7 @@ env:
 phases:
   install:
     runtime-versions:
-      golang: 1.16.8
+      golang: 1.16
   pre_build:
     commands:
       - docker login --username rudderlabs --password $dockerhub_passwd
@@ -40,4 +40,4 @@ phases:
       - docker push rudderstack/rudder-server-enterprise:$VERSION
 artifacts:
   files:
-    - "**/*"
+    - "**/*"

build/buildspec.yml

@@ -3,7 +3,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      golang: 1.16.8
+      golang: 1.16
   build:
     commands:
       - ls

generate-sql-migrations.go → cmd/generate-migrations/generate-sql-migrations.go

@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (

go.mod

@@ -63,6 +63,8 @@ require (
 	github.com/satori/go.uuid v1.2.0
 	github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c // indirect
 	github.com/segmentio/ksuid v1.0.2
+	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
+	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
 	github.com/snowflakedb/gosnowflake v1.3.4
 	github.com/spaolacci/murmur3 v1.1.0
 	github.com/spf13/cast v1.3.1
@@ -81,7 +83,6 @@ require (
 	go.uber.org/zap v1.14.0
 	golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
 	golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
-	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
 	golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	google.golang.org/api v0.39.0

go.sum

@@ -545,7 +545,11 @@ github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c/go.mod h1:kJ9mm
 github.com/segmentio/ksuid v1.0.2 h1:9yBfKyw4ECGTdALaF09Snw3sLJmYIX6AbPJrAy6MrDc=
 github.com/segmentio/ksuid v1.0.2/go.mod h1:BXuJDr2byAiHuQaQtSKoXh1J0YmUDurywOXgB2w+OSU=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
+github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU=
+github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=