PDE-1852: services as team, use Load* methods
#18
Conversation
| filename, err := url.JoinPath("testdata", baseTestDir, "apiserver", slug.Make(r.URL.Path)+".json") | ||
| urlPath := r.URL.Path | ||
| if r.URL.RawQuery != "" { | ||
| urlPath += "?" + r.URL.RawQuery |
There was a problem hiding this comment.
Turns out, this is needed to support pagination 😅
| log.Printf("using db file: %s", f) | ||
|
|
||
| db, err := sql.Open("sqlite", f) | ||
| func NewStore(dsn string) *Store { |
There was a problem hiding this comment.
NewStore at this point is identical to store/open.go, but this feels less critical to refactor now, so I'm leaving it as is for later.
| is_group INTEGER NOT NULL DEFAULT 0, | ||
| to_import INTEGER NOT NULL DEFAULT 0 | ||
| ) STRICT; | ||
|
|
||
| CREATE TABLE IF NOT EXISTS ext_team_groups ( | ||
| group_team_id TEXT NOT NULL, | ||
| member_team_id TEXT NOT NULL, | ||
| PRIMARY KEY (group_team_id, member_team_id), | ||
| FOREIGN KEY (group_team_id) REFERENCES ext_teams(id) ON DELETE CASCADE, | ||
| FOREIGN KEY (member_team_id) REFERENCES ext_teams(id) ON DELETE CASCADE |
There was a problem hiding this comment.
ext_team_groups stores groups which contain other groups. PagerDuty Services are entered into ext_teams table just like any other teams. However, it is marked as a "team group". Specifically, PagerDuty service would have group_team_id pointing to the Service ID, while the member_team_id points to the real team linked to the service.
If there is already
ext_team_groups, why would we needis_groupstill onext_teamstable?
I initially thought is_group is no longer necessary as it can be inferred from ext_team_groups, but then I realized that a service without any teams associated to it is a valid service which may have escalation policies, etc. As such, we need explicit mark whether the team is a group or not on the ext_teams table.
| @@ -17,7 +17,11 @@ import ( | |||
|
|
|||
| func withTestDB(t *testing.T) context.Context { | |||
| t.Helper() | |||
| ctx := store.WithContext(context.Background()) | |||
|
|
|||
| f := filepath.Join(t.TempDir(), slug.Make(t.Name())+".db") | |||
There was a problem hiding this comment.
Why do we not use memory store?
Making multiple calls to sql.Open from the same thread yields the same database. This causes problematic collisions when tests are run with t.Parallel().
LoadUsers/LoadTeams/LoadTeamMembersin PagerDutyLoad*methods for OpsgenieLoad*tocmd/import.goThis ended up being bigger changeset than I had planned, but taking advantage the fact that there is no work in flight and I could do a proper refactor, I went ahead and ported over the old implementations of fetching users, teams, and members to use database properly.
That being said, don't let the delta of lines changed fool you — most of them are test data 😄