Skip to content

Commit 494878b

Browse files
committed
Include team information for fetching by ID
When fetching by ID, we do not necessarily know the team ID, so include the team information as part of the fetch response.
1 parent 53fa3ea commit 494878b

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

team_token.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ type TeamToken struct {
5959
Token string `jsonapi:"attr,token"`
6060
ExpiredAt time.Time `jsonapi:"attr,expired-at,iso8601"`
6161
CreatedBy *CreatedByChoice `jsonapi:"polyrelation,created-by"`
62+
Team *Team `jsonapi:"relation,team"`
6263
}
6364

6465
// TeamTokenCreateOptions contains the options for creating a team token.

team_token_integration_test.go

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ func TestTeamTokensRead(t *testing.T) {
181181
tt, err := client.TeamTokens.Read(ctx, tmTest.ID)
182182
require.NoError(t, err)
183183
assert.NotEmpty(t, tt)
184+
require.NotEmpty(t, tt.Team)
185+
assert.Equal(t, tt.Team.ID, tmTest.ID)
184186

185187
ttTestCleanup()
186188
})
@@ -193,8 +195,10 @@ func TestTeamTokensRead(t *testing.T) {
193195

194196
tt, err := client.TeamTokens.Read(ctx, tmTest.ID)
195197
require.NoError(t, err)
196-
assert.NotEmpty(t, tt)
198+
require.NotEmpty(t, tt)
197199
assert.Equal(t, tt.ExpiredAt, oneDayLater)
200+
require.NotEmpty(t, tt.Team)
201+
assert.Equal(t, tt.Team.ID, tmTest.ID)
198202

199203
ttTestCleanup()
200204
})
@@ -229,9 +233,11 @@ func TestTeamTokensReadByID(t *testing.T) {
229233

230234
tt, err := client.TeamTokens.ReadByID(ctx, token.ID)
231235
require.NoError(t, err)
232-
assert.NotEmpty(t, tt)
236+
require.NotEmpty(t, tt)
233237
assert.Empty(t, tt.Description)
234238
assert.Equal(t, tt.ExpiredAt, oneDayLater)
239+
require.NotEmpty(t, tt.Team)
240+
assert.Equal(t, tt.Team.ID, tmTest.ID)
235241
})
236242

237243
t.Run("with multiple team tokens", func(t *testing.T) {
@@ -244,9 +250,11 @@ func TestTeamTokensReadByID(t *testing.T) {
244250

245251
tt, err := client.TeamTokens.ReadByID(ctx, token.ID)
246252
require.NoError(t, err)
247-
assert.NotEmpty(t, tt)
253+
require.NotEmpty(t, tt)
248254
assert.Equal(t, tt.Description, desc1)
249255
assert.Empty(t, tt.ExpiredAt)
256+
require.NotEmpty(t, tt.Team)
257+
assert.Equal(t, tt.Team.ID, tmTest.ID)
250258

251259
desc2 := fmt.Sprintf("go-tfe-team-token-test-%s", randomString(t))
252260
tokenWithExpiration, ttTestCleanup2 := createTeamTokenWithOptions(t, client, tmTest, TeamTokenCreateOptions{
@@ -257,9 +265,11 @@ func TestTeamTokensReadByID(t *testing.T) {
257265

258266
tt2, err := client.TeamTokens.ReadByID(ctx, tokenWithExpiration.ID)
259267
require.NoError(t, err)
260-
assert.NotEmpty(t, tt2)
268+
require.NotEmpty(t, tt2)
261269
assert.Equal(t, tt2.Description, desc2)
262270
assert.Equal(t, tt2.ExpiredAt, oneDayLater)
271+
require.NotEmpty(t, tt.Team)
272+
assert.Equal(t, tt.Team.ID, tmTest.ID)
263273
})
264274

265275
t.Run("when a token doesn't exists", func(t *testing.T) {

0 commit comments

Comments
 (0)