Skip to content

[usage] Add usageAttributionID to WorkspaceInstance model (in go) #10927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions components/usage/pkg/db/dbtest/workspace_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,15 @@ func NewWorkspaceInstance(t *testing.T, instance db.WorkspaceInstance) db.Worksp
status = instance.Status
}

attributionID := db.NewUserAttributionID(uuid.New().String())
if instance.UsageAttributionID != "" {
attributionID = instance.UsageAttributionID
}

return db.WorkspaceInstance{
ID: id,
WorkspaceID: workspaceID,
UsageAttributionID: attributionID,
Configuration: nil,
Region: "",
ImageBuildInfo: sql.NullString{},
Expand Down
32 changes: 32 additions & 0 deletions components/usage/pkg/db/workspace_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/google/uuid"
"gorm.io/datatypes"
"gorm.io/gorm"
"strings"
"time"
)

Expand All @@ -23,6 +24,7 @@ type WorkspaceInstance struct {
IdeURL string `gorm:"column:ideUrl;type:varchar;size:255;" json:"ideUrl"`
WorkspaceBaseImage string `gorm:"column:workspaceBaseImage;type:varchar;size:255;" json:"workspaceBaseImage"`
WorkspaceImage string `gorm:"column:workspaceImage;type:varchar;size:255;" json:"workspaceImage"`
UsageAttributionID AttributionID `gorm:"column:usageAttributionId;type:varchar;size:60;" json:"usageAttributionId"`

CreationTime VarcharTime `gorm:"column:creationTime;type:varchar;size:255;" json:"creationTime"`
StartedTime VarcharTime `gorm:"column:startedTime;type:varchar;size:255;" json:"startedTime"`
Expand Down Expand Up @@ -87,3 +89,33 @@ func ListWorkspaceInstancesInRange(ctx context.Context, conn *gorm.DB, from, to

return instances, nil
}

const (
AttributionEntity_User = "user"
AttributionEntity_Team = "team"
)

func newAttributionID(entity, identifier string) AttributionID {
return AttributionID(fmt.Sprintf("%s:%s", entity, identifier))
}

func NewUserAttributionID(userID string) AttributionID {
return newAttributionID(AttributionEntity_User, userID)
}

func NewTeamAttributionID(teamID string) AttributionID {
return newAttributionID(AttributionEntity_Team, teamID)
}

// AttributionID consists of an entity, and an identifier in the form:
// <entity>:<identifier>, e.g. team:a7dcf253-f05e-4dcf-9a47-cf8fccc74717
type AttributionID string

func (a AttributionID) Values() (entity string, identifier string) {
tokens := strings.Split(string(a), ":")
if len(tokens) != 2 {
return "", ""
}

return tokens[0], tokens[1]
}
22 changes: 22 additions & 0 deletions components/usage/pkg/db/workspace_instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,25 @@ func TestListWorkspaceInstancesInRange_InBatches(t *testing.T) {
require.NoError(t, err)
require.Len(t, results, len(instances))
}

func TestAttributionID_Values(t *testing.T) {
scenarios := []struct {
Input string
ExpectedEntity string
ExpectedID string
}{
{Input: "team:123", ExpectedEntity: db.AttributionEntity_Team, ExpectedID: "123"},
{Input: "user:123", ExpectedEntity: db.AttributionEntity_User, ExpectedID: "123"},
{Input: "user:123:invalid", ExpectedEntity: "", ExpectedID: ""},
{Input: "invalid:123:", ExpectedEntity: "", ExpectedID: ""},
{Input: "", ExpectedEntity: "", ExpectedID: ""},
}

for _, s := range scenarios {
t.Run(fmt.Sprintf("attribution in: %s, expecting: %s %s", s.Input, s.ExpectedEntity, s.ExpectedID), func(t *testing.T) {
entity, id := db.AttributionID(s.Input).Values()
require.Equal(t, s.ExpectedEntity, entity)
require.Equal(t, s.ExpectedID, id)
})
}
}