update imports, build yaml, and leeway build

Laurie T. Malau · Laurie T. Malau · commit 2d08a79b6d68 · 2022-11-17T23:14:44.000Z
diff --git a/components/gitpod-db/go-db/BUILD.yaml b/components/gitpod-db/go-db/BUILD.yaml
@@ -0,0 +1,20 @@
+packages:
+  - name: lib
+    type: go
+    srcs:
+      - "**/*.go"
+      - "go.mod"
+      - "go.sum"
+    deps:
+      - components/common-go:lib
+      - :init-testdb
+    env:
+      - CGO_ENABLED=0
+      - GOOS=linux
+    config:
+      packaging: library
+  - name: init-testdb
+    type: generic
+    deps:
+      - components/gitpod-db:dbtest-init
+    ephemeral: true
diff --git a/components/gitpod-db/go-db/cost_center_test.go b/components/gitpod-db/go-db/cost_center_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
diff --git a/components/gitpod-db/go-db/dbtest/cost_center.go b/components/gitpod-db/go-db/dbtest/cost_center.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"gorm.io/gorm"
diff --git a/components/gitpod-db/go-db/dbtest/stripe_customer.go b/components/gitpod-db/go-db/dbtest/stripe_customer.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"gorm.io/gorm"
diff --git a/components/gitpod-db/go-db/dbtest/usage.go b/components/gitpod-db/go-db/dbtest/usage.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"gorm.io/gorm"
diff --git a/components/gitpod-db/go-db/dbtest/workspace.go b/components/gitpod-db/go-db/dbtest/workspace.go
@@ -7,7 +7,7 @@ package dbtest
 import (
 	"database/sql"
 	"github.com/gitpod-io/gitpod/common-go/namegen"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"gorm.io/gorm"
diff --git a/components/gitpod-db/go-db/dbtest/workspace_instance.go b/components/gitpod-db/go-db/dbtest/workspace_instance.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"gorm.io/gorm"
diff --git a/components/gitpod-db/go-db/go.mod b/components/gitpod-db/go-db/go.mod
@@ -1,3 +1,17 @@
 module github.com/gitpod-io/gitpod/components/gitpod-db/go-db
 
 go 1.19
+
+require (
+	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	google.golang.org/grpc v1.50.1 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gorm.io/datatypes v1.0.7 // indirect
+	gorm.io/driver/mysql v1.3.2 // indirect
+	gorm.io/gorm v1.24.1 // indirect
+)
diff --git a/components/gitpod-db/go-db/go.sum b/components/gitpod-db/go-db/go.sum
diff --git a/components/gitpod-db/go-db/project_test.go b/components/gitpod-db/go-db/project_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
diff --git a/components/gitpod-db/go-db/stripe_customer_test.go b/components/gitpod-db/go-db/stripe_customer_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
diff --git a/components/gitpod-db/go-db/team_membership_test.go b/components/gitpod-db/go-db/team_membership_test.go
@@ -6,7 +6,7 @@ package db_test
 
 import (
 	"context"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
diff --git a/components/gitpod-db/go-db/usage_test.go b/components/gitpod-db/go-db/usage_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
diff --git a/components/gitpod-db/go-db/workspace_instance_test.go b/components/gitpod-db/go-db/workspace_instance_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/gitpod-io/gitpod/usage/pkg/apiv1"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
diff --git a/components/gitpod-db/go-db/workspace_test.go b/components/gitpod-db/go-db/workspace_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/dbtest"
 	"github.com/stretchr/testify/require"
 )
diff --git a/components/usage/BUILD.yaml b/components/usage/BUILD.yaml
@@ -6,10 +6,11 @@ packages:
       - "go.mod"
       - "go.sum"
     deps:
+      - components/gitpod-db/go-db:lib
+      - components/gitpod-db/go-db:init-testdb
       - components/common-go:lib
       - components/usage-api/go:lib
       - components/content-service-api/go:lib
-      - :init-testdb
     env:
       - CGO_ENABLED=0
       - GOOS=linux
@@ -20,6 +21,7 @@ packages:
   - name: lib
     type: go
     deps:
+      - components/gitpod-db/go-db:lib
       - components/common-go:lib
       - components/usage-api/go:lib
       - components/content-service-api/go:lib
@@ -31,12 +33,6 @@ packages:
       packaging: library
       dontTest: true
 
-  - name: init-testdb
-    type: generic
-    deps:
-      - components/gitpod-db:dbtest-init
-    ephemeral: true
-
   - name: docker
     type: docker
     deps:
diff --git a/components/usage/go.mod b/components/usage/go.mod
@@ -4,18 +4,18 @@ go 1.19
 
 require (
 	github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
+	github.com/gitpod-io/gitpod/components/gitpod-db/go-db v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/usage-api v0.0.0-00010101000000-000000000000
 	github.com/google/go-cmp v0.5.8
-	github.com/google/uuid v1.1.2
+	github.com/google/uuid v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/prometheus/client_golang v1.13.0
 	github.com/robfig/cron v1.2.0
 	github.com/spf13/cobra v1.4.0
 	github.com/stretchr/testify v1.7.0
 	github.com/stripe/stripe-go/v72 v72.114.0
-	google.golang.org/grpc v1.49.0
+	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
-	gorm.io/datatypes v1.0.6
 	gorm.io/gorm v1.24.1
 )
 
@@ -49,9 +49,12 @@ require (
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gorm.io/datatypes v1.0.7 // indirect
 	gorm.io/driver/mysql v1.4.4 // indirect
 )
 
+replace github.com/gitpod-io/gitpod/components/gitpod-db/go-db => ../gitpod-db/go-db // leeway
+
 replace github.com/gitpod-io/gitpod/common-go => ../common-go // leeway
 
 replace github.com/gitpod-io/gitpod/content-service/api => ../content-service-api/go // leeway
diff --git a/components/usage/go.sum b/components/usage/go.sum
diff --git a/components/usage/pkg/apiv1/billing_test.go b/components/usage/pkg/apiv1/billing_test.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"
 	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"testing"`
`10`	`10`
`11`	`11`	`common_db "github.com/gitpod-io/gitpod/common-go/db"`
`12`		`- "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"`
	`12`	`+ db "github.com/gitpod-io/gitpod/components/gitpod-db/go-db"`
`13`	`13`	`"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/dbtest"`
`14`	`14`	`"github.com/stretchr/testify/require"`
`15`	`15`	`)`