Skip to content
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

Added Team Project Access API #599

Merged
merged 7 commits into from
Jan 5, 2023
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Unreleased

## Bug Fixes

## Enhancements
* Add Beta endpoint `TeamProjectAccesses` to manage Project Access for Teams by @hs26gill [#599](https://github.com/hashicorp/go-tfe/pull/599)

# v1.16.0

## Bug Fixes
Expand Down
10 changes: 10 additions & 0 deletions errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ var (

ErrInvalidAccessTeamID = errors.New("invalid value for team access ID")

ErrInvalidTeamProjectAccessID = errors.New("invalid value for team project access ID")

ErrInvalidTeamProjectAccessType = errors.New("invalid type for team project access")

ErrInvalidTeamID = errors.New("invalid value for team ID")

ErrInvalidUsernames = errors.New("invalid value for usernames")
Expand Down Expand Up @@ -247,8 +251,12 @@ var (

ErrRequiredWorkspace = errors.New("workspace is required")

ErrRequiredProject = errors.New("project is required")

ErrRequiredWorkspaceID = errors.New("workspace ID is required")

ErrRequiredProjectID = errors.New("project ID is required")

ErrWorkspacesRequired = errors.New("workspaces is required")

ErrWorkspaceMinLimit = errors.New("must provide at least one workspace")
Expand Down Expand Up @@ -279,6 +287,8 @@ var (

ErrRequiredTeamAccessListOps = errors.New("TeamAccessListOptions is required")

ErrRequiredTeamProjectAccessListOps = errors.New("TeamProjectAccessListOptions is required")

ErrRequiredRunTriggerListOps = errors.New("RunTriggerListOptions is required")

ErrRequiredTFVerCreateOps = errors.New("version, URL and sha is required for AdminTerraformVersionCreateOptions")
Expand Down
1 change: 1 addition & 0 deletions generate_mocks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ mockgen -source=task_stages.go -destination=mocks/task_stages_mocks.go -package=
mockgen -source=team.go -destination=mocks/team_mocks.go -package=mocks
mockgen -source=team_access.go -destination=mocks/team_access_mocks.go -package=mocks
mockgen -source=team_member.go -destination=mocks/team_member_mocks.go -package=mocks
mockgen -source=team_project_access.go -destination=mocks/team_project_access_mocks.go -package=mocks
mockgen -source=team_token.go -destination=mocks/team_token_mocks.go -package=mocks
mockgen -source=user.go -destination=mocks/user_mocks.go -package=mocks
mockgen -source=user_token.go -destination=mocks/user_token_mocks.go -package=mocks
Expand Down
46 changes: 46 additions & 0 deletions helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1653,6 +1653,52 @@ func createTeamAccess(t *testing.T, client *Client, tm *Team, w *Workspace, org
}
}

func createTeamProjectAccess(t *testing.T, client *Client, tm *Team, p *Project, org *Organization) (*TeamProjectAccess, func()) {
var orgCleanup, tmCleanup, pCleanup func()

if org == nil {
org, orgCleanup = createOrganization(t, client)
}

if tm == nil {
tm, tmCleanup = createTeam(t, client, org)
}

if p == nil {
p, pCleanup = createProject(t, client, org)
}

ctx := context.Background()
tpa, err := client.TeamProjectAccess.Add(ctx, TeamProjectAccessAddOptions{
Access: *ProjectAccess(TeamProjectAccessAdmin),
Team: tm,
Project: p,
})
if err != nil {
t.Fatal(err)
}

return tpa, func() {
if err := client.TeamProjectAccess.Remove(ctx, tpa.ID); err != nil {
t.Errorf("Error removing team access! WARNING: Dangling resources\n"+
"may exist! The full error is shown below.\n\n"+
"TeamAccess: %s\nError: %s", tpa.ID, err)
}

if tmCleanup != nil {
tmCleanup()
}

if orgCleanup != nil {
orgCleanup()
}

if pCleanup != nil {
pCleanup()
}
}
}

func createTeamToken(t *testing.T, client *Client, tm *Team) (*TeamToken, func()) {
var tmCleanup func()

Expand Down
110 changes: 110 additions & 0 deletions mocks/team_project_access_mocks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading