Skip to content

Commit 928c8a2

Browse files
authored
Merge pull request #74 from intercube/task/add-map-create-source-flag
[BUGFIX] Allow map to create missing origin directories
2 parents 22f9c21 + e392b8f commit 928c8a2

3 files changed

Lines changed: 74 additions & 3 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ will prompt only when needed and save values automatically:
5252
- `intercube ssh` prompts for required login settings
5353
- `intercube sync` prompts for missing file path mappings
5454
- `intercube map --interactive` prompts to create mappings when none exist
55+
- `intercube map --create-origin-dir` / `intercube map -c` creates missing origin directories before mapping
5556

5657
`intercube login` is kept as a deprecated alias and prints a warning to use `intercube ssh`.
5758

‎cmd/map.go‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727

2828
var override = false
2929
var interactiveMapSetup = false
30+
var createOriginDir = false
3031

3132
var mapCmd = &cobra.Command{
3233
Use: "map",
@@ -51,7 +52,7 @@ var mapCmd = &cobra.Command{
5152
}
5253

5354
for _, mapping := range config.Mappings {
54-
if err := symlink(mapping.From, mapping.To); err != nil {
55+
if err := symlink(mapping.From, mapping.To, createOriginDir); err != nil {
5556
return err
5657
}
5758
}
@@ -64,9 +65,10 @@ func init() {
6465
rootCmd.AddCommand(mapCmd)
6566
mapCmd.PersistentFlags().BoolVarP(&override, "override", "o", false, "Overrides existing destination file")
6667
mapCmd.PersistentFlags().BoolVar(&interactiveMapSetup, "interactive", false, "Prompt to create mappings when missing")
68+
mapCmd.PersistentFlags().BoolVarP(&createOriginDir, "create-origin-dir", "c", false, "Create missing origin directories before mapping")
6769
}
6870

69-
func symlink(from string, to string) error {
71+
func symlink(from string, to string, createMissingOriginDirectory bool) error {
7072
resolvedFrom, err := expandHomePath(from)
7173
if err != nil {
7274
return err
@@ -82,7 +84,15 @@ func symlink(from string, to string) error {
8284
}
8385

8486
if !fileExists(resolvedFrom) {
85-
return fmt.Errorf("origin file %v does not exist", resolvedFrom)
87+
if createMissingOriginDirectory {
88+
if err := os.MkdirAll(resolvedFrom, 0755); err != nil {
89+
return fmt.Errorf("unable to create origin directory %v: %w", resolvedFrom, err)
90+
}
91+
92+
fmt.Printf("Created origin directory %v\n", resolvedFrom)
93+
} else {
94+
return fmt.Errorf("origin file %v does not exist", resolvedFrom)
95+
}
8696
}
8797

8898
alreadyMapped, mappedErr := destinationMatchesSource(resolvedFrom, resolvedTo)

‎cmd/map_test.go‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
package cmd
2+
3+
import (
4+
"os"
5+
"path/filepath"
6+
"strings"
7+
"testing"
8+
)
9+
10+
func TestSymlinkFailsWhenOriginIsMissing(t *testing.T) {
11+
tempDir := t.TempDir()
12+
origin := filepath.Join(tempDir, "shared", "sitemaps")
13+
destination := filepath.Join(tempDir, "current", "sitemaps")
14+
15+
err := symlink(origin, destination, false)
16+
if err == nil {
17+
t.Fatalf("expected missing origin to fail")
18+
}
19+
if !strings.Contains(err.Error(), "origin file") {
20+
t.Fatalf("unexpected error: %v", err)
21+
}
22+
}
23+
24+
func TestSymlinkCreatesMissingOriginDirectory(t *testing.T) {
25+
tempDir := t.TempDir()
26+
origin := filepath.Join(tempDir, "shared", "sitemaps")
27+
destination := filepath.Join(tempDir, "current", "sitemaps")
28+
29+
if err := os.MkdirAll(filepath.Dir(destination), 0755); err != nil {
30+
t.Fatalf("unable to create destination parent: %v", err)
31+
}
32+
33+
if err := symlink(origin, destination, true); err != nil {
34+
t.Fatalf("expected missing origin directory to be created: %v", err)
35+
}
36+
37+
originInfo, err := os.Stat(origin)
38+
if err != nil {
39+
t.Fatalf("expected origin directory to exist: %v", err)
40+
}
41+
if !originInfo.IsDir() {
42+
t.Fatalf("expected origin to be a directory")
43+
}
44+
45+
destinationInfo, err := os.Lstat(destination)
46+
if err != nil {
47+
t.Fatalf("expected destination symlink to exist: %v", err)
48+
}
49+
if destinationInfo.Mode()&os.ModeSymlink == 0 {
50+
t.Fatalf("expected destination to be a symlink")
51+
}
52+
53+
target, err := os.Readlink(destination)
54+
if err != nil {
55+
t.Fatalf("unable to read destination symlink: %v", err)
56+
}
57+
if target != origin {
58+
t.Fatalf("unexpected symlink target: got %q want %q", target, origin)
59+
}
60+
}

0 commit comments

Comments
 (0)