remove usage references

Laurie T. Malau · Laurie T. Malau · commit 363349aa77dc · 2022-11-17T23:16:57.000Z
diff --git a/components/gitpod-db/go-db/cost_center_test.go b/components/gitpod-db/go-db/cost_center_test.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db/dbtest"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
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/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/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/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/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/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/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/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/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/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"gorm.io/gorm"
diff --git a/components/gitpod-db/go-db/project_test.go b/components/gitpod-db/go-db/project_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db/dbtest"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"gorm.io/gorm"
diff --git a/components/gitpod-db/go-db/stripe_customer_test.go b/components/gitpod-db/go-db/stripe_customer_test.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db/dbtest"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/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,8 +6,8 @@ package db_test
 
 import (
 	"context"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db/dbtest"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"testing"
diff --git a/components/gitpod-db/go-db/usage_test.go b/components/gitpod-db/go-db/usage_test.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db/dbtest"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 )
diff --git a/components/gitpod-db/go-db/varchar_test.go b/components/gitpod-db/go-db/varchar_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db/dbtest"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db/dbtest"
 	"github.com/stretchr/testify/require"
 	"gorm.io/gorm"
 )
diff --git a/components/gitpod-db/go-db/workspace_instance_test.go b/components/gitpod-db/go-db/workspace_instance_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/gitpod-io/gitpod/usage/pkg/apiv1"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db/dbtest"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/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,8 +9,8 @@ import (
 	"testing"
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db"
-	"github.com/gitpod-io/gitpod/gitpod-db/go-db/db/dbtest"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db/dbtest"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/components/usage/pkg/apiv1/billing.go b/components/usage/pkg/apiv1/billing.go
@@ -14,8 +14,8 @@ import (
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
 	"github.com/gitpod-io/gitpod/common-go/log"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
 	v1 "github.com/gitpod-io/gitpod/usage-api/v1"
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
 	"github.com/gitpod-io/gitpod/usage/pkg/stripe"
 	"github.com/google/uuid"
 	stripe_api "github.com/stripe/stripe-go/v72"
diff --git a/components/usage/pkg/apiv1/billing_test.go b/components/usage/pkg/apiv1/billing_test.go
@@ -8,8 +8,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
-	"github.com/gitpod-io/gitpod/usage/pkg/db/dbtest"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 )
diff --git a/components/usage/pkg/apiv1/pricer.go b/components/usage/pkg/apiv1/pricer.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
 )
 
 const (
diff --git a/components/usage/pkg/apiv1/usage.go b/components/usage/pkg/apiv1/usage.go
@@ -14,8 +14,8 @@ import (
 
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
 	"github.com/gitpod-io/gitpod/common-go/log"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
 	v1 "github.com/gitpod-io/gitpod/usage-api/v1"
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
diff --git a/components/usage/pkg/apiv1/usage_test.go b/components/usage/pkg/apiv1/usage_test.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/gitpod-io/gitpod/common-go/baseserver"
 	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/db/dbtest"
 	v1 "github.com/gitpod-io/gitpod/usage-api/v1"
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
-	"github.com/gitpod-io/gitpod/usage/pkg/db/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
diff --git a/components/usage/pkg/server/server.go b/components/usage/pkg/server/server.go
@@ -20,9 +20,9 @@ import (
 	"github.com/gitpod-io/gitpod/common-go/baseserver"
 	common_db "github.com/gitpod-io/gitpod/common-go/db"
 	"github.com/gitpod-io/gitpod/common-go/log"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
 	v1 "github.com/gitpod-io/gitpod/usage-api/v1"
 	"github.com/gitpod-io/gitpod/usage/pkg/apiv1"
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
 	"github.com/gitpod-io/gitpod/usage/pkg/stripe"
 	"gorm.io/gorm"
 )
diff --git a/components/usage/pkg/stripe/stripe.go b/components/usage/pkg/stripe/stripe.go
@@ -14,13 +14,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
 	"github.com/gitpod-io/gitpod/common-go/log"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
 	"github.com/stripe/stripe-go/v72"
 	"github.com/stripe/stripe-go/v72/client"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 const (
diff --git a/components/usage/pkg/stripe/stripe_test.go b/components/usage/pkg/stripe/stripe_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/install/installer/pkg/components/usage/configmap.go b/install/installer/pkg/components/usage/configmap.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/gitpod-io/gitpod/common-go/baseserver"
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
 	"github.com/gitpod-io/gitpod/usage/pkg/server"
 	"github.com/gitpod-io/gitpod/usage/pkg/stripe"
 
diff --git a/install/installer/pkg/config/v1/experimental/experimental.go b/install/installer/pkg/config/v1/experimental/experimental.go
@@ -15,7 +15,7 @@ import (
 
 	agentSmith "github.com/gitpod-io/gitpod/agent-smith/pkg/config"
 	"github.com/gitpod-io/gitpod/common-go/grpc"
-	"github.com/gitpod-io/gitpod/usage/pkg/db"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go-db/db"
 	"github.com/gitpod-io/gitpod/ws-daemon/pkg/cpulimit"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

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