Fix tests

pulumi · Nov 16, 2023 · 56d9a52 · 56d9a52
1 parent 63115de
commit 56d9a52
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/provider/pkg/internal/pulumiapi/orgtokens.go b/provider/pkg/internal/pulumiapi/orgtokens.go
@@ -88,7 +88,7 @@ func (c *Client) DeleteOrgAccessToken(ctx context.Context, tokenId, orgName stri
 }
 
 func (c *Client) GetOrgAccessToken(ctx context.Context, tokenId, orgName string) (*AccessToken, error) {
-	apiPath := path.Join("orgs", orgName, "tokens", tokenId)
+	apiPath := path.Join("orgs", orgName, "tokens")
 
 	var listRes listTokenResponse
 

diff --git a/provider/pkg/internal/pulumiapi/orgtokens_test.go b/provider/pkg/internal/pulumiapi/orgtokens_test.go
@@ -1,16 +1,13 @@
 package pulumiapi
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
-var orgCtx = context.Background()
-
 func TestDeleteOrgAccessToken(t *testing.T) {
 	orgName := "anOrg"
 	tokenId := "abcdegh"
@@ -151,7 +148,7 @@ func TestGetOrgAccessToken(t *testing.T) {
 			ResponseBody:      resp,
 		})
 		defer cleanup()
-		token, err := c.GetOrgAccessToken(ctx, org, id)
+		token, err := c.GetOrgAccessToken(ctx, id, org)
 		assert.NoError(t, err)
 		assert.Equal(t, &AccessToken{
 			ID:          id,
@@ -171,7 +168,7 @@ func TestGetOrgAccessToken(t *testing.T) {
 			},
 		})
 		defer cleanup()
-		token, err := c.GetOrgAccessToken(ctx, org, id)
+		token, err := c.GetOrgAccessToken(ctx, id, org)
 		assert.Nil(t, token, "token should be nil")
 		assert.EqualError(t,
 			err,

diff --git a/provider/pkg/internal/pulumiapi/teamtokens.go b/provider/pkg/internal/pulumiapi/teamtokens.go
@@ -88,7 +88,7 @@ func (c *Client) DeleteTeamAccessToken(ctx context.Context, tokenId, orgName, te
 }
 
 func (c *Client) GetTeamAccessToken(ctx context.Context, tokenId, orgName, teamName string) (*AccessToken, error) {
-	apiPath := path.Join("orgs", orgName, "teams", teamName, "tokens", tokenId)
+	apiPath := path.Join("orgs", orgName, "teams", teamName, "tokens")
 
 	var listRes listTokenResponse
 

diff --git a/provider/pkg/internal/pulumiapi/teamtokens_test.go b/provider/pkg/internal/pulumiapi/teamtokens_test.go
@@ -127,7 +127,7 @@ func TestGetTeamAccessToken(t *testing.T) {
 			ResponseBody:      resp,
 		})
 		defer cleanup()
-		token, err := c.GetTeamAccessToken(ctx, org, team, id)
+		token, err := c.GetTeamAccessToken(ctx, id, org, team)
 		assert.NoError(t, err)
 		assert.Equal(t, &AccessToken{
 			ID:          id,
@@ -147,7 +147,7 @@ func TestGetTeamAccessToken(t *testing.T) {
 			},
 		})
 		defer cleanup()
-		token, err := c.GetTeamAccessToken(ctx, org, team, id)
+		token, err := c.GetTeamAccessToken(ctx, id, org, team)
 		assert.Nil(t, token, "token should be nil")
 		assert.EqualError(t,
 			err,