Merge branch 'main' into telemetry

coder · kylecarbs · Jun 17, 2022 · Jun 12, 2022 · Jun 12, 2022 · Jun 13, 2022
commit 9a31eb350c5b018da5cb9255e50e0da08d2d781b
diff --git a/cli/server.go b/cli/server.go
@@ -137,6 +137,7 @@ func server() *cobra.Command {
 			}
 
 			config := createConfig(cmd)
+			builtinPostgres := false
 			// Only use built-in if PostgreSQL URL isn't specified!
 			if !inMemoryDatabase && postgresURL == "" {
 				var closeFunc func() error
@@ -145,6 +146,7 @@ func server() *cobra.Command {
 				if err != nil {
 					return err
 				}
+				builtinPostgres = true
 				defer func() {
 					// Gracefully shut PostgreSQL down!
 					_ = closeFunc()
@@ -310,20 +312,20 @@ func server() *cobra.Command {
 			}
 			// Disable telemetry if in dev-mode. If the telemetry flag
 			// is manually specified, override this behavior!
-			if buildModeDev && !cmd.Flags().Changed("telemetry-enable") {
+			if !cmd.Flags().Changed("telemetry-enable") {
 				telemetryEnable = false
 			}
 			reporter, err := telemetry.New(telemetry.Options{
-				DeploymentID: deploymentID,
-				Database:     options.Database,
-				Logger:       logger.Named("telemetry"),
-				URL:          telemetryURL,
-				DevMode:      dev,
-				Disabled:     !telemetryEnable,
-				GitHubOAuth:  oauth2GithubClientID != "",
-				Prometheus:   promEnabled,
-				STUN:         len(stunServers) != 0,
-				Tunnel:       tunnel,
+				BuiltinPostgres: builtinPostgres,
+				DeploymentID:    deploymentID,
+				Database:        options.Database,
+				Logger:          logger.Named("telemetry"),
+				URL:             telemetryURL,
+				Disabled:        !telemetryEnable,
+				GitHubOAuth:     oauth2GithubClientID != "",
+				Prometheus:      promEnabled,
+				STUN:            len(stunServers) != 0,
+				Tunnel:          tunnel,
 			})
 			if err != nil {
 				return xerrors.Errorf("create telemetry reporter: %w", err)

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -675,25 +675,6 @@ func (q *fakeQuerier) GetWorkspaceBuildsCreatedAfter(_ context.Context, after ti
 	return workspaceBuilds, nil
 }
 
-func (q *fakeQuerier) GetWorkspacesByOrganizationIDs(_ context.Context, req database.GetWorkspacesByOrganizationIDsParams) ([]database.Workspace, error) {
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-
-	workspaces := make([]database.Workspace, 0)
-	for _, workspace := range q.workspaces {
-		for _, id := range req.Ids {
-			if workspace.OrganizationID != id {
-				continue
-			}
-			if workspace.Deleted != req.Deleted {
-				continue
-			}
-			workspaces = append(workspaces, workspace)
-		}
-	}
-	return workspaces, nil
-}
-
 func (q *fakeQuerier) GetOrganizations(_ context.Context) ([]database.Organization, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
@@ -1028,45 +1009,6 @@ func (q *fakeQuerier) GetTemplates(_ context.Context) ([]database.Template, erro
 	return q.templates[:], nil
 }
 
-func (q *fakeQuerier) GetTemplatesByOrganization(_ context.Context, arg database.GetTemplatesByOrganizationParams) ([]database.Template, error) {
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-
-	templates := make([]database.Template, 0)
-	for _, template := range q.templates {
-		if template.Deleted != arg.Deleted {
-			continue
-		}
-		if template.OrganizationID != arg.OrganizationID {
-			continue
-		}
-		templates = append(templates, template)
-	}
-	if len(templates) == 0 {
-		return nil, sql.ErrNoRows
-	}
-	return templates, nil
-}
-
-func (q *fakeQuerier) GetTemplatesByIDs(_ context.Context, ids []uuid.UUID) ([]database.Template, error) {
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-
-	templates := make([]database.Template, 0)
-	for _, template := range q.templates {
-		for _, id := range ids {
-			if template.ID.String() != id.String() {
-				continue
-			}
-			templates = append(templates, template)
-		}
-	}
-	if len(templates) == 0 {
-		return nil, sql.ErrNoRows
-	}
-	return templates, nil
-}
-
 func (q *fakeQuerier) GetOrganizationMemberByUserID(_ context.Context, arg database.GetOrganizationMemberByUserIDParams) (database.OrganizationMember, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()

diff --git a/...023_template_created_by_not_null.down.sql → ...024_template_created_by_not_null.down.sql b/...023_template_created_by_not_null.down.sql → ...024_template_created_by_not_null.down.sql
diff --git a/...00023_template_created_by_not_null.up.sql → ...00024_template_created_by_not_null.up.sql b/...00023_template_created_by_not_null.up.sql → ...00024_template_created_by_not_null.up.sql
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -48,15 +48,6 @@ WHERE
 LIMIT
 	1;
 
--- name: GetTemplatesByOrganization :many
-SELECT
-	*
-FROM
-	templates
-WHERE
-	organization_id = $1
-	AND deleted = $2;
-
 -- name: GetTemplates :many
 SELECT * FROM templates;