Skip to content

feat: add support for coder_git_auth data source #6334

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.

Sign up for GitHub

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

Merged
merged 21 commits into from
Feb 27, 2023
Merged

feat: add support for coder_git_auth data source #6334

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c64636b
Add git auth providers schema
kylecarbs Feb 22, 2023
6a61712
Pipe git auth providers to the schema
kylecarbs Feb 22, 2023
3d67a0d
Add git auth providers to the API
kylecarbs Feb 22, 2023
604cf5b
Add gitauth endpoint to query authenticated state
kylecarbs Feb 23, 2023
85db3c2
Add endpoint to query git state
kylecarbs Feb 23, 2023
e418892
Use BroadcastChannel to automatically authenticate with Git
kylecarbs Feb 23, 2023
6b75f3e
Add error validation for submitting the create workspace form
kylecarbs Feb 24, 2023
1ad5db1
Fix panic on template dry-run
kylecarbs Feb 25, 2023
320c10d
Add tests for the template version Git auth endpoint
kylecarbs Feb 25, 2023
ff2b822
Merge branch 'main' into gitauth
kylecarbs Feb 25, 2023
18488f8
Show error if no gitauth is configured
kylecarbs Feb 26, 2023
18523d5
Add gitauth to cliui
kylecarbs Feb 26, 2023
2c9fb64
Fix unused method receiver
kylecarbs Feb 26, 2023
7cbf190
Fix linting errors
kylecarbs Feb 26, 2023
1335c93
Fix dbauthz querier test
kylecarbs Feb 27, 2023
671be8c
Fix make gen
kylecarbs Feb 27, 2023
177625a
Add JavaScript test for git auth
kylecarbs Feb 27, 2023
2be97bb
Fix bad error message
kylecarbs Feb 27, 2023
69dea35
Fix provisionerd test race
kylecarbs Feb 27, 2023
5fdf8ce
Fix requested changes
kylecarbs Feb 27, 2023
993ede8
Add comment to CreateWorkspacePageView
kylecarbs Feb 27, 2023
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
Prev Previous commit
Next Next commit
Add tests for the template version Git auth endpoint
  • Loading branch information
@kylecarbs
kylecarbs committed Feb 25, 2023
commit 320c10d4a81915fb99be3cc46ca6ef21ad84adcc
52 changes: 48 additions & 4 deletions coderd/templateversions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"net/http"
"regexp"
"testing"

"github.com/google/uuid"
Expand All @@ -14,6 +15,7 @@ import (
"github.com/coder/coder/coderd/audit"
"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/gitauth"
"github.com/coder/coder/coderd/provisionerdserver"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/examples"
Expand Down Expand Up @@ -436,21 +438,63 @@ func TestTemplateVersionParameters(t *testing.T) {

func TestTemplateVersionsGitAuth(t *testing.T) {
t.Parallel()
t.Run("WithoutAny", func(t *testing.T) {
t.Run("Empty", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
user := coderdtest.CreateFirstUser(t, client)
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

_, err := client.TemplateVersionGitAuth(ctx, version.ID)
require.NoError(t, err)
})
// t.Run("", func(t *testing.T) {
t.Run("Authenticated", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{
IncludeProvisionerDaemon: true,
GitAuthConfigs: []*gitauth.Config{{
OAuth2Config: &oauth2Config{},
ID: "github",
Regex: regexp.MustCompile(`github\.com`),
Type: codersdk.GitProviderGitHub,
}},
})
user := coderdtest.CreateFirstUser(t, client)
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
Parse: echo.ParseComplete,
ProvisionPlan: []*proto.Provision_Response{{
Type: &proto.Provision_Response_Complete{
Complete: &proto.Provision_Complete{
GitAuthProviders: []string{"github"},
},
},
}},
})
version = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
require.Empty(t, version.Job.Error)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

// })
// Not authenticated to start!
providers, err := client.TemplateVersionGitAuth(ctx, version.ID)
require.NoError(t, err)
require.Len(t, providers, 1)
require.False(t, providers[0].Authenticated)

// Perform the Git auth callback to authenticate the user...
resp := gitAuthCallback(t, "github", client)
_ = resp.Body.Close()
require.Equal(t, http.StatusTemporaryRedirect, resp.StatusCode)

// Ensure that the returned Git auth for the template is authenticated!
providers, err = client.TemplateVersionGitAuth(ctx, version.ID)
require.NoError(t, err)
require.Len(t, providers, 1)
require.True(t, providers[0].Authenticated)
})
}

func TestTemplateVersionResources(t *testing.T) {
Expand Down