tests

gitpod-io · Jun 7, 2022 · 08a44d6 · 08a44d6
1 parent 586f22e
commit 08a44d6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/components/usage/pkg/controller/reconciler_test.go b/components/usage/pkg/controller/reconciler_test.go
@@ -15,22 +15,29 @@ import (
 
 func TestUsageReconciler_Reconcile(t *testing.T) {
 	conn := db.ConnectForTests(t)
-	workspaceID := "gitpodio-gitpod-gyjr82jkfnd"
 	instanceStatus := []byte(`{"phase": "stopped", "conditions": {"deployed": false, "pullingImages": false, "serviceExists": false}}`)
 	startOfMay := time.Date(2022, 05, 1, 0, 00, 00, 00, time.UTC)
 	startOfJune := time.Date(2022, 06, 1, 0, 00, 00, 00, time.UTC)
+	workspace := db.Workspace{
+		ID:         "gitpodio-gitpod-gyjr82jkfnd",
+		OwnerID:    uuid.New(),
+		Type:       "prebuild",
+		ContextURL: "https://github.com/gitpod-io/gitpod",
+		Context:    []byte(`{"title":"[usage] List workspaces for each workspace instance in usage period","repository":{"cloneUrl":"https://github.com/gitpod-io/gitpod.git","host":"github.com","name":"gitpod","owner":"gitpod-io","private":false},"ref":"mp/usage-list-workspaces","refType":"branch","revision":"586f22ecaeeb3b4796fd92f9ae1ca3512ca1e330","nr":10495,"base":{"repository":{"cloneUrl":"https://github.com/gitpod-io/gitpod.git","host":"github.com","name":"gitpod","owner":"gitpod-io","private":false},"ref":"mp/usage-validate-instances","refType":"branch"},"normalizedContextURL":"https://github.com/gitpod-io/gitpod/pull/10495","checkoutLocation":"gitpod"}`),
+		Config:     []byte(`{"image":"eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1","workspaceLocation":"gitpod/gitpod-ws.code-workspace","checkoutLocation":"gitpod","ports":[{"port":1337,"onOpen":"open-preview"},{"port":3000,"onOpen":"ignore"},{"port":3001,"onOpen":"ignore"},{"port":3306,"onOpen":"ignore"},{"port":4000,"onOpen":"ignore"},{"port":5900,"onOpen":"ignore"},{"port":6080,"onOpen":"ignore"},{"port":7777,"onOpen":"ignore"},{"port":9229,"onOpen":"ignore"},{"port":9999,"onOpen":"ignore"},{"port":13001,"onOpen":"ignore"},{"port":13444}],"tasks":[{"name":"Install Preview Environment kube-context","command":"(cd dev/preview/previewctl && go install .)\npreviewctl install-context\nexit\n"},{"name":"Add Harvester kubeconfig","command":"./dev/preview/util/download-and-merge-harvester-kubeconfig.sh\nexit 0\n"},{"name":"Java","command":"if [ -z \"$RUN_GRADLE_TASK\" ]; then\n  read -r -p \"Press enter to continue Java gradle task\"\nfi\nleeway exec --package components/supervisor-api/java:lib --package components/gitpod-protocol/java:lib -- ./gradlew --build-cache build\nleeway exec --package components/ide/jetbrains/backend-plugin:plugin --package components/ide/jetbrains/gateway-plugin:publish --parallel -- ./gradlew --build-cache buildPlugin\n"},{"name":"TypeScript","before":"scripts/branch-namespace.sh","init":"yarn --network-timeout 100000 && yarn build"},{"name":"Go","before":"pre-commit install --install-hooks","init":"leeway exec --filter-type go -v -- go mod verify","openMode":"split-right"}],"vscode":{"extensions":["bradlc.vscode-tailwindcss","EditorConfig.EditorConfig","golang.go","hashicorp.terraform","ms-azuretools.vscode-docker","ms-kubernetes-tools.vscode-kubernetes-tools","stkb.rewrap","zxh404.vscode-proto3","matthewpi.caddyfile-support","heptio.jsonnet","timonwong.shellcheck","vscjava.vscode-java-pack","fwcd.kotlin","dbaeumer.vscode-eslint","esbenp.prettier-vscode"]},"jetbrains":{"goland":{"prebuilds":{"version":"stable"}}},"_origin":"repo","_featureFlags":[]}`),
+	}
 	instances := []db.WorkspaceInstance{
 		{
 			ID:          uuid.New(),
-			WorkspaceID: workspaceID,
+			WorkspaceID: workspace.ID,
 			StartedTime: db.NewVarcharTime(time.Date(2022, 05, 1, 00, 00, 00, 00, time.UTC)),
 			StoppedTime: db.NewVarcharTime(time.Date(2022, 06, 1, 1, 0, 0, 0, time.UTC)),
 			Status:      instanceStatus,
 		},
 		// No creation time, invalid record
 		{
 			ID:          uuid.New(),
-			WorkspaceID: workspaceID,
+			WorkspaceID: workspace.ID,
 			StoppedTime: db.NewVarcharTime(time.Date(2022, 06, 1, 1, 0, 0, 0, time.UTC)),
 			Status:      instanceStatus,
 		},
@@ -39,6 +46,9 @@ func TestUsageReconciler_Reconcile(t *testing.T) {
 	tx := conn.Create(instances)
 	require.NoError(t, tx.Error)
 
+	tx = conn.Create(&workspace)
+	require.NoError(t, tx.Error)
+
 	reconciler := NewUsageReconciler(conn)
 
 	status, err := reconciler.ReconcileTimeRange(context.Background(), startOfMay, startOfJune)
@@ -48,16 +58,6 @@ func TestUsageReconciler_Reconcile(t *testing.T) {
 		EndTime:                   startOfJune,
 		WorkspaceInstances:        1,
 		InvalidWorkspaceInstances: 1,
+		Workspaces:                1,
 	}, status)
 }
-
-//
-//func createWorkspaceInstance(t *testing.T, conn *gorm.DB) {
-//	instance := db.WorkspaceInstance{
-//		ID:           uuid.New(),
-//		WorkspaceID:  workspaceID,
-//		CreationTime: db.NewVarcharTime(time.Date(2022, 06, 1, 00, 00, 00, 00, time.UTC)),
-//		StoppedTime:  db.NewVarcharTime(time.Date(2022, 06, 1, 1, 0, 0, 0, time.UTC)),
-//		Status:       status,
-//	}
-//}
diff --git a/components/usage/pkg/db/workspace.go b/components/usage/pkg/db/workspace.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"github.com/google/uuid"
 	"gorm.io/datatypes"
 	"gorm.io/gorm"
 	"time"
@@ -16,7 +17,7 @@ import (
 // Workspace represents the underlying DB object
 type Workspace struct {
 	ID          string         `gorm:"primary_key;column:id;type:char;size:36;" json:"id"`
-	OwnerID     string         `gorm:"column:ownerId;type:char;size:36;" json:"ownerId"`
+	OwnerID     uuid.UUID      `gorm:"column:ownerId;type:char;size:36;" json:"ownerId"`
 	ProjectID   sql.NullString `gorm:"column:projectId;type:char;size:36;" json:"projectId"`
 	Description string         `gorm:"column:description;type:varchar;size:255;" json:"description"`
 	Type        string         `gorm:"column:type;type:char;size:16;default:regular;" json:"type"`