Commitb52d56a

committed

Merge main into fixgit

2 parents00b83d5 +eb60692 commitb52d56aCopy full SHA for b52d56a

File tree

-13

lines changed

-13

lines changed

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,10 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/gliderlabs/ssh"`
`11`	`11`	`"github.com/google/uuid"`
`12`		`-"github.com/spf13/cobra"`
`13`	`12`	`"github.com/stretchr/testify/require"`
`14`	`13`	`gossh"golang.org/x/crypto/ssh"`
`15`	`14`
`16`	`15`	`"github.com/coder/coder/cli/clitest"`
`17`		`-"github.com/coder/coder/cli/config"`
`18`	`16`	`"github.com/coder/coder/coderd/coderdtest"`
`19`	`17`	`"github.com/coder/coder/codersdk"`
`20`	`18`	`"github.com/coder/coder/provisioner/echo"`
`@@ -108,12 +106,3 @@ func TestGitSSH(t *testing.T) {`
`108`	`106`	`require.EqualValues(t,1,inc)`
`109`	`107`	`})`
`110`	`108`	`}`
`111`		`-`
`112`		`-// createConfig consumes the global configuration flag to produce a config root.`
`113`		`-funccreateConfig(cmd*cobra.Command) config.Root {`
`114`		`-globalRoot,err:=cmd.Flags().GetString("global-config")`
`115`		`-iferr!=nil {`
`116`		`-panic(err)`
`117`		`-}`
`118`		`-returnconfig.Root(globalRoot)`
`119`		`-}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,10 @@ import (`
`4`	`4`	`"crypto/sha256"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`-"github.com/coder/coder/cryptorand"`
`8`	`7`	`"golang.org/x/crypto/bcrypt"`
`9`	`8`	`"golang.org/x/crypto/pbkdf2"`
	`9`	`+`
	`10`	`+"github.com/coder/coder/cryptorand"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`var (`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro`
`120`	`120`
`121`	`121`	`env:=os.Environ()`
`122`	`122`	`env=append(env,`
`123`		`-"CODER_URL="+start.Metadata.CoderUrl,`
	`123`	`+"CODER_AGENT_URL="+start.Metadata.CoderUrl,`
`124`	`124`	`"CODER_WORKSPACE_TRANSITION="+strings.ToLower(start.Metadata.WorkspaceTransition.String()),`
`125`	`125`	`"CODER_WORKSPACE_NAME="+start.Metadata.WorkspaceName,`
`126`	`126`	`"CODER_WORKSPACE_OWNER="+start.Metadata.WorkspaceOwner,`

Comments

(0)