Fix lint

BrunoQuaresma · BrunoQuaresma · commit 7f73d90070c7 · 2024-07-18T14:20:08.000Z
diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go
@@ -19,10 +19,10 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/database/provisionerjobs"
 	"github.com/coder/coder/v2/coderd/database/pubsub"
+	"github.com/coder/coder/v2/coderd/dormancy"
 	"github.com/coder/coder/v2/coderd/notifications"
 	"github.com/coder/coder/v2/coderd/schedule"
 	"github.com/coder/coder/v2/coderd/wsbuilder"
-	"github.com/coder/coder/v2/enterprise/coderd/dormancy"
 )
 
 // Executor automatically starts or stops workspaces.
@@ -326,11 +326,14 @@ func (e *Executor) runOnce(t time.Time) Stats {
 					}
 				}
 				if dormantNotification != nil {
-					dormancy.NotifyWorkspaceDormant(
+					_, err = dormancy.NotifyWorkspaceDormant(
 						e.ctx,
 						e.notificationsEnqueuer,
 						*dormantNotification,
 					)
+					if err != nil {
+						e.log.Warn(e.ctx, "failed to notify of workspace "+dormantNotification.Workspace.Name+" marked as dormant", slog.Error(err))
+					}
 				}
 				return nil
 			}()
diff --git a/coderd/dormancy/notifications.go b/coderd/dormancy/notifications.go
@@ -1,3 +1,8 @@
+// This package is located outside of the enterprise package to ensure
+// accessibility in the putWorkspaceDormant function. This design choice allows
+// workspaces to be taken out of dormancy even if the license has expired,
+// ensuring critical functionality remains available without an active
+// enterprise license.
 package dormancy
 
 import (
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -23,6 +23,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/database/provisionerjobs"
+	"github.com/coder/coder/v2/coderd/dormancy"
 	"github.com/coder/coder/v2/coderd/httpapi"
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/rbac"
@@ -34,7 +35,6 @@ import (
 	"github.com/coder/coder/v2/coderd/wsbuilder"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/codersdk/agentsdk"
-	"github.com/coder/coder/v2/enterprise/coderd/dormancy"
 )
 
 var (
diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go
@@ -16,11 +16,11 @@ import (
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
+	"github.com/coder/coder/v2/coderd/dormancy"
 	"github.com/coder/coder/v2/coderd/notifications"
 	agpl "github.com/coder/coder/v2/coderd/schedule"
 	"github.com/coder/coder/v2/coderd/tracing"
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/enterprise/coderd/dormancy"
 )
 
 // EnterpriseTemplateScheduleStore provides an agpl.TemplateScheduleStore that
diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
@@ -7,12 +7,13 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
+
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
diff --git a/enterprise/coderd/workspaces_test.go b/enterprise/coderd/workspaces_test.go
@@ -7,9 +7,10 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/slog"
 	"github.com/stretchr/testify/require"
 
+	"cdr.dev/slog"
+
 	"cdr.dev/slog/sloggers/slogtest"
 
 	"github.com/coder/coder/v2/coderd/audit"

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ import (`
`19`	`19`	`"github.com/coder/coder/v2/coderd/database/dbtime"`
`20`	`20`	`"github.com/coder/coder/v2/coderd/database/provisionerjobs"`
`21`	`21`	`"github.com/coder/coder/v2/coderd/database/pubsub"`
	`22`	`+ "github.com/coder/coder/v2/coderd/dormancy"`
`22`	`23`	`"github.com/coder/coder/v2/coderd/notifications"`
`23`	`24`	`"github.com/coder/coder/v2/coderd/schedule"`
`24`	`25`	`"github.com/coder/coder/v2/coderd/wsbuilder"`
`25`		`- "github.com/coder/coder/v2/enterprise/coderd/dormancy"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`// Executor automatically starts or stops workspaces.`
`@@ -326,11 +326,14 @@ func (e *Executor) runOnce(t time.Time) Stats {`
`326`	`326`	`}`
`327`	`327`	`}`
`328`	`328`	`if dormantNotification != nil {`
`329`		`- dormancy.NotifyWorkspaceDormant(`
	`329`	`+ _, err = dormancy.NotifyWorkspaceDormant(`
`330`	`330`	`e.ctx,`
`331`	`331`	`e.notificationsEnqueuer,`
`332`	`332`	`*dormantNotification,`
`333`	`333`	`)`
	`334`	`+ if err != nil {`
	`335`	`+ e.log.Warn(e.ctx, "failed to notify of workspace "+dormantNotification.Workspace.Name+" marked as dormant", slog.Error(err))`
	`336`	`+ }`
`334`	`337`	`}`
`335`	`338`	`return nil`
`336`	`339`	`}()`