Merge branch 'main' into oauth

coder · kylecarbs · Apr 23, 2022 · Apr 15, 2022 · Apr 17, 2022 · Apr 17, 2022
commit 917dfef806006082699ce754f3323886c868e60d
diff --git a/cli/start.go b/cli/start.go
@@ -19,6 +19,7 @@ import (
 	"github.com/briandowns/spinner"
 	"github.com/coreos/go-systemd/daemon"
 	"github.com/google/go-github/v43/github"
+	"github.com/pion/turn/v2"
 	"github.com/spf13/cobra"
 	"golang.org/x/oauth2"
 	xgithub "golang.org/x/oauth2/github"
@@ -64,6 +65,7 @@ func start() *cobra.Command {
 		tlsEnable                        bool
 		tlsKeyFile                       string
 		tlsMinVersion                    string
+		turnRelayAddress                 string
 		skipTunnel                       bool
 		traceDatadog                     bool
 		secureAuthCookie                 bool
@@ -607,3 +609,11 @@ func configureGithubOAuth2(accessURL *url.URL, clientID, clientSecret string, al
 		},
 	}, nil
 }
+
+type datadogLogger struct {
+	logger slog.Logger
+}
+
+func (d *datadogLogger) Log(msg string) {
+	d.logger.Debug(context.Background(), msg)
+}
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -35,17 +35,14 @@ type Options struct {
 	Pubsub    database.Pubsub
 
 	AgentConnectionUpdateFrequency time.Duration
-	AccessURL                      *url.URL
-	Logger                         slog.Logger
-	Database                       database.Store
-	Pubsub                         database.Pubsub
-
-	AWSCertificates      awsidentity.Certificates
-	GoogleTokenValidator *idtoken.Validator
-	GithubOAuth2Config   *GithubOAuth2Config
-
-	SecureAuthCookie   bool
-	SSHKeygenAlgorithm gitsshkey.Algorithm
+	AWSCertificates                awsidentity.Certificates
+	AzureCertificates              x509.VerifyOptions
+	GoogleTokenValidator           *idtoken.Validator
+	GithubOAuth2Config             *GithubOAuth2Config
+	ICEServers                     []webrtc.ICEServer
+	SecureAuthCookie               bool
+	SSHKeygenAlgorithm             gitsshkey.Algorithm
+	TURNServer                     *turnconn.Server
 }
 
 // New constructs the Coder API into an HTTP handler.

diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -51,10 +51,11 @@ import (
 )
 
 type Options struct {
-	AWSInstanceIdentity    awsidentity.Certificates
-	GithubOAuth2Config     *coderd.GithubOAuth2Config
-	GoogleInstanceIdentity *idtoken.Validator
-	SSHKeygenAlgorithm     gitsshkey.Algorithm
+	AWSCertificates      awsidentity.Certificates
+	AzureCertificates    x509.VerifyOptions
+	GithubOAuth2Config   *coderd.GithubOAuth2Config
+	GoogleTokenValidator *idtoken.Validator
+	SSHKeygenAlgorithm   gitsshkey.Algorithm
 }
 
 // New constructs an in-memory coderd instance and returns
@@ -120,9 +121,10 @@ func New(t *testing.T, options *Options) *codersdk.Client {
 		Database:                       db,
 		Pubsub:                         pubsub,
 
-		AWSCertificates:      options.AWSInstanceIdentity,
+		AWSCertificates:      options.AWSCertificates,
+		AzureCertificates:    options.AzureCertificates,
 		GithubOAuth2Config:   options.GithubOAuth2Config,
-		GoogleTokenValidator: options.GoogleInstanceIdentity,
+		GoogleTokenValidator: options.GoogleTokenValidator,
 		SSHKeygenAlgorithm:   options.SSHKeygenAlgorithm,
 		TURNServer:           turnServer,
 	})