Merge branch 'main' into agent-slog-opts

matifali · matifali · commit 4ef619b1803c · 2023-05-24T11:10:46.000Z
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -349,7 +349,7 @@ func getWorkspaceAndAgent(ctx context.Context, inv *clibase.Invocation, client *
 		err            error
 	)
 
-	workspace, err = namedWorkspace(inv.Context(), client, workspaceParts[0])
+	workspace, err = namedWorkspace(ctx, client, workspaceParts[0])
 	if err != nil {
 		return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err
 	}
@@ -362,6 +362,11 @@ func getWorkspaceAndAgent(ctx context.Context, inv *clibase.Invocation, client *
 		if err != nil {
 			return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err
 		}
+		// Fetch up-to-date build information after completion.
+		workspace.LatestBuild, err = client.WorkspaceBuild(ctx, workspace.LatestBuild.ID)
+		if err != nil {
+			return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err
+		}
 	}
 	if workspace.LatestBuild.Transition == codersdk.WorkspaceTransitionDelete {
 		return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, xerrors.Errorf("workspace %q is being deleted", workspace.Name)
diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
@@ -53,7 +53,7 @@ RUN mkdir --parents "$GOPATH" && \
 	# charts and values files
 	go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.5.0 && \
 	# sqlc for Go code generation
-	go install github.com/kyleconroy/sqlc/cmd/sqlc@v1.16.0 && \
+	go install github.com/kyleconroy/sqlc/cmd/sqlc@v1.17.2 && \
 	# gcr-cleaner-cli used by CI to prune unused images
 	go install github.com/sethvargo/gcr-cleaner/cmd/gcr-cleaner-cli@v0.5.1 && \
 	# ruleguard for checking custom rules, without needing to run all of

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ func getWorkspaceAndAgent(ctx context.Context, inv clibase.Invocation, client `
`349`	`349`	`err error`
`350`	`350`	`)`
`351`	`351`
`352`		`- workspace, err = namedWorkspace(inv.Context(), client, workspaceParts[0])`
	`352`	`+ workspace, err = namedWorkspace(ctx, client, workspaceParts[0])`
`353`	`353`	`if err != nil {`
`354`	`354`	`return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err`
`355`	`355`	`}`
`@@ -362,6 +362,11 @@ func getWorkspaceAndAgent(ctx context.Context, inv clibase.Invocation, client `
`362`	`362`	`if err != nil {`
`363`	`363`	`return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err`
`364`	`364`	`}`
	`365`	`+ // Fetch up-to-date build information after completion.`
	`366`	`+ workspace.LatestBuild, err = client.WorkspaceBuild(ctx, workspace.LatestBuild.ID)`
	`367`	`+ if err != nil {`
	`368`	`+ return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err`
	`369`	`+ }`
`365`	`370`	`}`
`366`	`371`	`if workspace.LatestBuild.Transition == codersdk.WorkspaceTransitionDelete {`
`367`	`372`	`return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, xerrors.Errorf("workspace %q is being deleted", workspace.Name)`