Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

chore: Force codersdk to not import anything from database#1576

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Emyrk merged 15 commits intomainfromstevenmasley/clean_codersdk
May 19, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
15 commits
Select commitHold shift + click to select a range
8d086e7
chore: Force codersdk to not import anything from database
EmyrkMay 18, 2022
c452991
chore: Move all database types in codersdk out
EmyrkMay 18, 2022
de0d26a
Merge rules files into 1
EmyrkMay 18, 2022
3456244
Move gorules to /script
EmyrkMay 18, 2022
e1f7011
Merge remote-tracking branch 'origin/main' into stevenmasley/clean_co…
EmyrkMay 18, 2022
8c5d66e
Fix unit test assert types
EmyrkMay 18, 2022
db536c0
Make gen
EmyrkMay 19, 2022
85aa0fe
Merge remote-tracking branch 'origin/main' into stevenmasley/clean_co…
EmyrkMay 19, 2022
7811333
Make gen
EmyrkMay 19, 2022
96b4227
Merge remote-tracking branch 'origin/main' into stevenmasley/clean_co…
EmyrkMay 19, 2022
d2a7506
Make gen
EmyrkMay 19, 2022
ae8014e
Fix type
EmyrkMay 19, 2022
34537af
Fix ts mocks
EmyrkMay 19, 2022
2cc2ffd
Fix ts issue
EmyrkMay 19, 2022
ce24743
Merge remote-tracking branch 'origin/main' into stevenmasley/clean_co…
EmyrkMay 19, 2022
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
2 changes: 1 addition & 1 deletion.golangci.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@ linters-settings:
settings:
ruleguard:
failOn: all
rules: rules.go
rules:'${configDir}/scripts/rules.go'

staticcheck:
# https://staticcheck.io/docs/options#checks
Expand Down
9 changes: 4 additions & 5 deletionscli/cliui/provisionerjob.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import (
"github.com/google/uuid"
"golang.org/x/xerrors"

"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
)

Expand DownExpand Up@@ -165,16 +164,16 @@ func ProvisionerJob(ctx context.Context, writer io.Writer, opts ProvisionerJobOp
}
output := ""
switch log.Level {
casedatabase.LogLevelTrace,database.LogLevelDebug:
casecodersdk.LogLevelTrace,codersdk.LogLevelDebug:
if !opts.Verbose {
continue
}
output = Styles.Placeholder.Render(log.Output)
casedatabase.LogLevelError:
casecodersdk.LogLevelError:
output = defaultStyles.Error.Render(log.Output)
casedatabase.LogLevelWarn:
casecodersdk.LogLevelWarn:
output = Styles.Warn.Render(log.Output)
casedatabase.LogLevelInfo:
casecodersdk.LogLevelInfo:
output = log.Output
}
jobMutex.Lock()
Expand Down
2 changes: 1 addition & 1 deletioncli/cliui/resources.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ func WorkspaceResources(writer io.Writer, resources []codersdk.WorkspaceResource
// Address on stop indexes whether a resource still exists when in the stopped transition.
addressOnStop := map[string]codersdk.WorkspaceResource{}
for _, resource := range resources {
if resource.Transition !=database.WorkspaceTransitionStop {
if resource.Transition !=codersdk.WorkspaceTransitionStop {
continue
}
addressOnStop[resource.Type+"."+resource.Name] = resource
Expand Down
10 changes: 5 additions & 5 deletionscli/cliui/resources_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ func TestWorkspaceResources(t *testing.T) {
err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
Type: "google_compute_instance",
Name: "dev",
Transition:database.WorkspaceTransitionStart,
Transition:codersdk.WorkspaceTransitionStart,
Agents: []codersdk.WorkspaceAgent{{
Name: "dev",
Status: codersdk.WorkspaceAgentConnected,
Expand All@@ -46,15 +46,15 @@ func TestWorkspaceResources(t *testing.T) {
done := make(chan struct{})
go func() {
err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
Transition:database.WorkspaceTransitionStart,
Transition:codersdk.WorkspaceTransitionStart,
Type: "google_compute_disk",
Name: "root",
}, {
Transition:database.WorkspaceTransitionStop,
Transition:codersdk.WorkspaceTransitionStop,
Type: "google_compute_disk",
Name: "root",
}, {
Transition:database.WorkspaceTransitionStart,
Transition:codersdk.WorkspaceTransitionStart,
Type: "google_compute_instance",
Name: "dev",
Agents: []codersdk.WorkspaceAgent{{
Expand All@@ -65,7 +65,7 @@ func TestWorkspaceResources(t *testing.T) {
Architecture: "amd64",
}},
}, {
Transition:database.WorkspaceTransitionStart,
Transition:codersdk.WorkspaceTransitionStart,
Type: "kubernetes_pod",
Name: "dev",
Agents: []codersdk.WorkspaceAgent{{
Expand Down
3 changes: 1 addition & 2 deletionscli/configssh.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import (

"github.com/coder/coder/cli/cliflag"
"github.com/coder/coder/cli/cliui"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
)

Expand DownExpand Up@@ -86,7 +85,7 @@ func configSSH() *cobra.Command {
return err
}
for _, resource := range resources {
if resource.Transition !=database.WorkspaceTransitionStart {
if resource.Transition !=codersdk.WorkspaceTransitionStart {
continue
}
for _, agent := range resource.Agents {
Expand Down
5 changes: 2 additions & 3 deletionscli/create.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import (

"github.com/coder/coder/cli/cliflag"
"github.com/coder/coder/cli/cliui"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
)

Expand DownExpand Up@@ -134,8 +133,8 @@ func create() *cobra.Command {
parameters = append(parameters, codersdk.CreateParameterRequest{
Name: parameterSchema.Name,
SourceValue: value,
SourceScheme:database.ParameterSourceSchemeData,
DestinationScheme:database.ParameterDestinationScheme(parameterSchema.DefaultDestinationScheme),
SourceScheme:codersdk.ParameterSourceSchemeData,
DestinationScheme: parameterSchema.DefaultDestinationScheme,
})
}
_, _ = fmt.Fprintln(cmd.OutOrStdout())
Expand Down
3 changes: 1 addition & 2 deletionscli/delete.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import (
"github.com/spf13/cobra"

"github.com/coder/coder/cli/cliui"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
)

Expand All@@ -33,7 +32,7 @@ func delete() *cobra.Command {
}
before := time.Now()
build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{
Transition:database.WorkspaceTransitionDelete,
Transition:codersdk.WorkspaceTransitionDelete,
})
if err != nil {
return err
Expand Down
7 changes: 3 additions & 4 deletionscli/list.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import (

"github.com/coder/coder/cli/cliui"
"github.com/coder/coder/coderd/autobuild/schedule"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
)

Expand DownExpand Up@@ -66,17 +65,17 @@ func list() *cobra.Command {
}

switch workspace.LatestBuild.Transition {
casedatabase.WorkspaceTransitionStart:
casecodersdk.WorkspaceTransitionStart:
status = "Running"
if inProgress {
status = "Starting"
}
casedatabase.WorkspaceTransitionStop:
casecodersdk.WorkspaceTransitionStop:
status = "Stopped"
if inProgress {
status = "Stopping"
}
casedatabase.WorkspaceTransitionDelete:
casecodersdk.WorkspaceTransitionDelete:
status = "Deleted"
if inProgress {
status = "Deleting"
Expand Down
3 changes: 1 addition & 2 deletionscli/portforward.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ import (

coderagent "github.com/coder/coder/agent"
"github.com/coder/coder/cli/cliui"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
)

Expand DownExpand Up@@ -80,7 +79,7 @@ func portForward() *cobra.Command {
if err != nil {
return err
}
if workspace.LatestBuild.Transition !=database.WorkspaceTransitionStart {
if workspace.LatestBuild.Transition !=codersdk.WorkspaceTransitionStart {
return xerrors.New("workspace must be in start transition to port-forward")
}
if workspace.LatestBuild.Job.CompletedAt == nil {
Expand Down
2 changes: 1 addition & 1 deletioncli/server.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -395,7 +395,7 @@ func server() *cobra.Command {
for _, workspace := range workspaces {
before := time.Now()
build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{
Transition:database.WorkspaceTransitionDelete,
Transition:codersdk.WorkspaceTransitionDelete,
})
if err != nil {
return xerrors.Errorf("delete workspace: %w", err)
Expand Down
5 changes: 2 additions & 3 deletionscli/ssh.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import (
"github.com/coder/coder/cli/cliui"
"github.com/coder/coder/coderd/autobuild/notify"
"github.com/coder/coder/coderd/autobuild/schedule"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/cryptorand"
)
Expand DownExpand Up@@ -193,7 +192,7 @@ func getWorkspaceAndAgent(cmd *cobra.Command, client *codersdk.Client, orgID uui
}
}

if workspace.LatestBuild.Transition !=database.WorkspaceTransitionStart {
if workspace.LatestBuild.Transition !=codersdk.WorkspaceTransitionStart {
return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, xerrors.New("workspace must be in start transition to ssh")
}
if workspace.LatestBuild.Job.CompletedAt == nil {
Expand All@@ -202,7 +201,7 @@ func getWorkspaceAndAgent(cmd *cobra.Command, client *codersdk.Client, orgID uui
return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err
}
}
if workspace.LatestBuild.Transition ==database.WorkspaceTransitionDelete {
if workspace.LatestBuild.Transition ==codersdk.WorkspaceTransitionDelete {
return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, xerrors.Errorf("workspace %q is being deleted", workspace.Name)
}

Expand Down
3 changes: 1 addition & 2 deletionscli/start.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import (
"github.com/spf13/cobra"

"github.com/coder/coder/cli/cliui"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
)

Expand All@@ -31,7 +30,7 @@ func start() *cobra.Command {
}
before := time.Now()
build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{
Transition:database.WorkspaceTransitionStart,
Transition:codersdk.WorkspaceTransitionStart,
})
if err != nil {
return err
Expand Down
3 changes: 1 addition & 2 deletionscli/stop.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import (
"github.com/spf13/cobra"

"github.com/coder/coder/cli/cliui"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
)

Expand All@@ -31,7 +30,7 @@ func stop() *cobra.Command {
}
before := time.Now()
build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{
Transition:database.WorkspaceTransitionStop,
Transition:codersdk.WorkspaceTransitionStop,
})
if err != nil {
return err
Expand Down
8 changes: 4 additions & 4 deletionscli/templatecreate.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,9 +128,9 @@ func templateCreate() *cobra.Command {
func createValidTemplateVersion(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, hash string, parameters ...codersdk.CreateParameterRequest) (*codersdk.TemplateVersion, []codersdk.CreateParameterRequest, error) {
before := time.Now()
version, err := client.CreateTemplateVersion(cmd.Context(), organization.ID, codersdk.CreateTemplateVersionRequest{
StorageMethod:database.ProvisionerStorageMethodFile,
StorageMethod:codersdk.ProvisionerStorageMethodFile,
StorageSource: hash,
Provisioner: provisioner,
Provisioner:codersdk.ProvisionerType(provisioner),
ParameterValues: parameters,
})
if err != nil {
Expand DownExpand Up@@ -192,8 +192,8 @@ func createValidTemplateVersion(cmd *cobra.Command, client *codersdk.Client, org
parameters = append(parameters, codersdk.CreateParameterRequest{
Name: parameterSchema.Name,
SourceValue: value,
SourceScheme:database.ParameterSourceSchemeData,
DestinationScheme:database.ParameterDestinationScheme(parameterSchema.DefaultDestinationScheme),
SourceScheme:codersdk.ParameterSourceSchemeData,
DestinationScheme: parameterSchema.DefaultDestinationScheme,
})
_, _ = fmt.Fprintln(cmd.OutOrStdout())
}
Expand Down
5 changes: 2 additions & 3 deletionscli/templateupdate.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import (
"golang.org/x/xerrors"

"github.com/coder/coder/cli/cliui"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/provisionersdk"
)
Expand DownExpand Up@@ -68,9 +67,9 @@ func templateUpdate() *cobra.Command {
before := time.Now()
templateVersion, err := client.CreateTemplateVersion(cmd.Context(), organization.ID, codersdk.CreateTemplateVersionRequest{
TemplateID: template.ID,
StorageMethod:database.ProvisionerStorageMethodFile,
StorageMethod:codersdk.ProvisionerStorageMethodFile,
StorageSource: resp.Hash,
Provisioner:database.ProvisionerType(provisioner),
Provisioner:codersdk.ProvisionerType(provisioner),
})
if err != nil {
return err
Expand Down
12 changes: 6 additions & 6 deletionscmd/cliui/main.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ func main() {
log := codersdk.ProvisionerJobLog{
CreatedAt: time.Now(),
Output: fmt.Sprintf("Some log %d", count),
Level:database.LogLevelInfo,
Level:codersdk.LogLevelInfo,
}
switch {
case count == 10:
Expand All@@ -133,7 +133,7 @@ func main() {
log.Stage = "Cleaning Up"
}
if count%5 == 0 {
log.Level =database.LogLevelWarn
log.Level =codersdk.LogLevelWarn
}
count++
if log.Output == "" && log.Stage == "" {
Expand DownExpand Up@@ -188,15 +188,15 @@ func main() {
RunE: func(cmd *cobra.Command, args []string) error {
disconnected := database.Now().Add(-4 * time.Second)
return cliui.WorkspaceResources(cmd.OutOrStdout(), []codersdk.WorkspaceResource{{
Transition:database.WorkspaceTransitionStart,
Transition:codersdk.WorkspaceTransitionStart,
Type: "google_compute_disk",
Name: "root",
}, {
Transition:database.WorkspaceTransitionStop,
Transition:codersdk.WorkspaceTransitionStop,
Type: "google_compute_disk",
Name: "root",
}, {
Transition:database.WorkspaceTransitionStart,
Transition:codersdk.WorkspaceTransitionStart,
Type: "google_compute_instance",
Name: "dev",
Agents: []codersdk.WorkspaceAgent{{
Expand All@@ -207,7 +207,7 @@ func main() {
Architecture: "amd64",
}},
}, {
Transition:database.WorkspaceTransitionStart,
Transition:codersdk.WorkspaceTransitionStart,
Type: "kubernetes_pod",
Name: "dev",
Agents: []codersdk.WorkspaceAgent{{
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp