Merge branch 'main' into mafredri/coderd-test-timeouts

mafredri · web-flow · commit 52d480cfdf42 · 2022-08-04T20:36:23.000+03:00
diff --git a/cli/state.go b/cli/state.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"fmt"
 	"io"
 	"os"
 	"time"
@@ -50,7 +51,7 @@ func statePull() *cobra.Command {
 			}
 
 			if len(args) < 2 {
-				cmd.Println(string(state))
+				_, _ = fmt.Fprintln(cmd.OutOrStdout(), string(state))
 				return nil
 			}
 
diff --git a/go.mod b/go.mod
@@ -185,7 +185,7 @@ require (
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.2
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -310,6 +310,7 @@ func applyAutomaticInstanceID(resource *tfjson.StateResource, agents []*proto.Ag
 	key, isValid := map[string]string{
 		"google_compute_instance":         "instance_id",
 		"aws_instance":                    "id",
+		"aws_spot_instance_request":       "spot_instance_id",
 		"azurerm_linux_virtual_machine":   "virtual_machine_id",
 		"azurerm_windows_virtual_machine": "virtual_machine_id",
 	}[resource.Type]
diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go
@@ -219,6 +219,10 @@ func TestInstanceIDAssociation(t *testing.T) {
 		Auth:          "aws-instance-identity",
 		ResourceType:  "aws_instance",
 		InstanceIDKey: "id",
+	}, {
+		Auth:          "aws-instance-identity",
+		ResourceType:  "aws_spot_instance_request",
+		InstanceIDKey: "spot_instance_id",
 	}, {
 		Auth:          "azure-instance-identity",
 		ResourceType:  "azurerm_linux_virtual_machine",
diff --git a/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPageView.tsx b/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPageView.tsx
@@ -53,9 +53,7 @@ export const SSHKeysPageView: FC<SSHKeysPageViewProps> = ({
         <>
           <CodeExample code={sshKey.public_key.trim()} />
           <div>
-            <Button variant="outlined" onClick={onRegenerateClick}>
-              {Language.regenerateLabel}
-            </Button>
+            <Button onClick={onRegenerateClick}>{Language.regenerateLabel}</Button>
           </div>
         </>
       )}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package cli`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "fmt"`
`4`	`5`	`"io"`
`5`	`6`	`"os"`
`6`	`7`	`"time"`
`@@ -50,7 +51,7 @@ func statePull() *cobra.Command {`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`if len(args) < 2 {`
`53`		`- cmd.Println(string(state))`
	`54`	`+ _, _ = fmt.Fprintln(cmd.OutOrStdout(), string(state))`
`54`	`55`	`return nil`
`55`	`56`	`}`
`56`	`57`