Commit0b15642

authored

Make coder dotfiles symlinking idempotent (#7525)

Signed-off-by: Spike Curtis <spike@coder.com>

1 parent424f954 commit0b15642Copy full SHA for 0b15642

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,10 @@ func (r RootCmd) dotfiles() clibase.Cmd {`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`
	`228`	`+// attempt to delete the file before creating a new symlink. This overwrites any existing symlinks`
	`229`	`+// which are typically leftover from a previous call to coder dotfiles. We do this best effort and`
	`230`	`+// ignore errors because the symlink may or may not exist. Any regular files are backed up above.`
	`231`	`+_=os.Remove(to)`
`228`	`232`	`err=os.Symlink(from,to)`
`229`	`233`	`iferr!=nil {`
`230`	`234`	`returnxerrors.Errorf("symlinking %s to %s: %w",from,to,err)`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,17 @@ func TestDotfiles(t *testing.T) {`
`116`	`116`	`b,err=os.ReadFile(filepath.Join(string(root),".bashrc.bak"))`
`117`	`117`	`require.NoError(t,err)`
`118`	`118`	`require.Equal(t,string(b),"backup")`
	`119`	`+`
	`120`	`+// check for idempotency`
	`121`	`+inv,_=clitest.New(t,"dotfiles","--global-config",string(root),"--symlink-dir",string(root),"-y",testRepo)`
	`122`	`+err=inv.Run()`
	`123`	`+require.NoError(t,err)`
	`124`	`+b,err=os.ReadFile(filepath.Join(string(root),".bashrc"))`
	`125`	`+require.NoError(t,err)`
	`126`	`+require.Equal(t,string(b),"wow")`
	`127`	`+b,err=os.ReadFile(filepath.Join(string(root),".bashrc.bak"))`
	`128`	`+require.NoError(t,err)`
	`129`	`+require.Equal(t,string(b),"backup")`
`119`	`130`	`})`
`120`	`131`	`}`
`121`	`132`

Comments

(0)