Skip to content

Commit 72e92d9

Browse files
committed
fix test
Signed-off-by: Sylwester Piskozub <sylwesterpiskozub@gmail.com>
1 parent 50253b9 commit 72e92d9

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

app/controlplane/pkg/biz/apitoken_integration_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ func randomName() string {
3838
func (s *apiTokenTestSuite) TestCreate() {
3939
ctx := context.Background()
4040
s.Run("invalid org ID", func() {
41-
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, "deadbeef")
41+
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, toPtrS("deadbeef"))
4242
s.Error(err)
4343
s.True(biz.IsErrInvalidUUID(err))
4444
s.Nil(token)
4545
})
4646

4747
s.Run("happy path without expiration nor description", func() {
48-
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, s.org.ID)
48+
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, &s.org.ID)
4949
s.NoError(err)
5050
s.NotNil(token.ID)
5151
s.Equal(s.org.ID, token.OrganizationID.String())
@@ -56,7 +56,7 @@ func (s *apiTokenTestSuite) TestCreate() {
5656
})
5757

5858
s.Run("happy path with description and expiration", func() {
59-
token, err := s.APIToken.Create(ctx, randomName(), toPtrS("tokenStr"), toPtrDuration(24*time.Hour), s.org.ID)
59+
token, err := s.APIToken.Create(ctx, randomName(), toPtrS("tokenStr"), toPtrDuration(24*time.Hour), &s.org.ID)
6060
s.NoError(err)
6161
s.Equal(s.org.ID, token.OrganizationID.String())
6262
s.Equal("tokenStr", token.Description)
@@ -65,7 +65,7 @@ func (s *apiTokenTestSuite) TestCreate() {
6565
})
6666

6767
s.Run("happy path with project", func() {
68-
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, s.org.ID, biz.APITokenWithProject(s.p1))
68+
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, &s.org.ID, biz.APITokenWithProject(s.p1))
6969
s.NoError(err)
7070
s.Equal(s.org.ID, token.OrganizationID.String())
7171
s.Equal(s.p1.ID, *token.ProjectID)
@@ -128,7 +128,7 @@ func (s *apiTokenTestSuite) TestCreate() {
128128
opts = append(opts, biz.APITokenWithProject(tc.project))
129129
}
130130

131-
token, err := s.APIToken.Create(ctx, tc.tokenName, nil, nil, s.org.ID, opts...)
131+
token, err := s.APIToken.Create(ctx, tc.tokenName, nil, nil, &s.org.ID, opts...)
132132
if tc.wantErrMsg != "" {
133133
s.Error(err)
134134
s.Contains(err.Error(), tc.wantErrMsg)
@@ -145,7 +145,7 @@ func (s *apiTokenTestSuite) TestCreate() {
145145

146146
func (s *apiTokenTestSuite) TestAuthzPolicies() {
147147
// a new token has a new set of policies associated
148-
token, err := s.APIToken.Create(context.Background(), randomName(), nil, nil, s.org.ID)
148+
token, err := s.APIToken.Create(context.Background(), randomName(), nil, nil, &s.org.ID)
149149
require.NoError(s.T(), err)
150150

151151
// With the new architecture, API token policies are stored in the database, not in Casbin
@@ -308,7 +308,7 @@ func (s *apiTokenTestSuite) TestList() {
308308
}
309309

310310
func (s *apiTokenTestSuite) TestGeneratedJWT() {
311-
token, err := s.APIToken.Create(context.Background(), randomName(), nil, toPtrDuration(24*time.Hour), s.org.ID)
311+
token, err := s.APIToken.Create(context.Background(), randomName(), nil, toPtrDuration(24*time.Hour), &s.org.ID)
312312
s.NoError(err)
313313
require.NotNil(s.T(), token)
314314

@@ -358,30 +358,30 @@ func (s *apiTokenTestSuite) SetupTest() {
358358
require.NoError(s.T(), err)
359359

360360
// Create 2 tokens for org 1
361-
s.t1, err = s.APIToken.Create(ctx, randomName(), nil, nil, s.org.ID)
361+
s.t1, err = s.APIToken.Create(ctx, randomName(), nil, nil, &s.org.ID)
362362
require.NoError(s.T(), err)
363-
s.t2, err = s.APIToken.Create(ctx, randomName(), nil, nil, s.org.ID)
363+
s.t2, err = s.APIToken.Create(ctx, randomName(), nil, nil, &s.org.ID)
364364
require.NoError(s.T(), err)
365365
// and 1 token for org 2
366-
s.t3, err = s.APIToken.Create(ctx, randomName(), nil, nil, s.org2.ID)
366+
s.t3, err = s.APIToken.Create(ctx, randomName(), nil, nil, &s.org2.ID)
367367
require.NoError(s.T(), err)
368368

369369
// Create 2 tokens for project 1
370-
s.t4, err = s.APIToken.Create(ctx, randomName(), nil, nil, s.org.ID, biz.APITokenWithProject(s.p1))
370+
s.t4, err = s.APIToken.Create(ctx, randomName(), nil, nil, &s.org.ID, biz.APITokenWithProject(s.p1))
371371
require.NoError(s.T(), err)
372-
s.t5, err = s.APIToken.Create(ctx, randomName(), nil, nil, s.org.ID, biz.APITokenWithProject(s.p1))
372+
s.t5, err = s.APIToken.Create(ctx, randomName(), nil, nil, &s.org.ID, biz.APITokenWithProject(s.p1))
373373
require.NoError(s.T(), err)
374374

375375
// Create 1 token for project 2
376-
s.t6, err = s.APIToken.Create(ctx, randomName(), nil, nil, s.org.ID, biz.APITokenWithProject(s.p2))
376+
s.t6, err = s.APIToken.Create(ctx, randomName(), nil, nil, &s.org.ID, biz.APITokenWithProject(s.p2))
377377
require.NoError(s.T(), err)
378378
}
379379

380380
func (s *apiTokenTestSuite) TestUpdateLastUsedAt() {
381381
ctx := context.Background()
382382

383383
s.Run("update last used at", func() {
384-
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, s.org.ID)
384+
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, &s.org.ID)
385385
s.NoError(err)
386386
s.Nil(token.LastUsedAt)
387387

@@ -407,7 +407,7 @@ func (s *apiTokenTestSuite) TestUpdateLastUsedAt() {
407407
})
408408

409409
s.Run("token is revoked", func() {
410-
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, s.org.ID)
410+
token, err := s.APIToken.Create(ctx, randomName(), nil, nil, &s.org.ID)
411411
s.NoError(err)
412412
err = s.APIToken.Revoke(ctx, s.org.ID, token.ID.String())
413413
s.NoError(err)

0 commit comments

Comments
 (0)