Skip to content

Commit

Permalink
fix commands for windows
Browse files Browse the repository at this point in the history
  • Loading branch information
eemcmullan committed Sep 6, 2023
1 parent 86c6fca commit fc2f170
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
24 changes: 12 additions & 12 deletions cmd/analyze.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ import (

var (
// application source path inside the container
SourceMountPath = filepath.Join(InputPath, "source")
SourceMountPath = path.Join(InputPath, "source")
// analyzer config files
ConfigMountPath = filepath.Join(InputPath, "config")
ConfigMountPath = path.Join(InputPath, "config")
// user provided rules path
RulesMountPath = filepath.Join(RulesetPath, "input")
RulesMountPath = path.Join(RulesetPath, "input")
// paths to files in the container
AnalysisOutputMountPath = filepath.Join(OutputPath, "output.yaml")
DepsOutputMountPath = filepath.Join(OutputPath, "dependencies.yaml")
ProviderSettingsMountPath = filepath.Join(ConfigMountPath, "settings.json")
AnalysisOutputMountPath = path.Join(OutputPath, "output.yaml")
DepsOutputMountPath = path.Join(OutputPath, "dependencies.yaml")
ProviderSettingsMountPath = path.Join(ConfigMountPath, "settings.json")
)

// kantra analyze flags
Expand Down Expand Up @@ -170,7 +170,7 @@ func (a *analyzeCommand) Validate() error {
return fmt.Errorf("%w failed to get absolute path for input file %s", err, a.input)
}
// make sure we mount a file and not a dir
SourceMountPath = filepath.Join(SourceMountPath, filepath.Base(a.input))
SourceMountPath = path.Join(SourceMountPath, filepath.Base(a.input))
a.isFileInput = true
}
if a.mode != string(provider.FullAnalysisMode) &&
Expand Down Expand Up @@ -436,7 +436,7 @@ func (a *analyzeCommand) getRulesVolumes() (map[string]string, error) {
}

} else {
rulesVolumes[r] = filepath.Join(RulesMountPath, filepath.Base(r))
rulesVolumes[r] = path.Join(RulesMountPath, filepath.Base(r))
}
}
if rulesetNeeded {
Expand All @@ -446,7 +446,7 @@ func (a *analyzeCommand) getRulesVolumes() (map[string]string, error) {
a.log.V(1).Error(err, "failed to create temp ruleset", "path", tempRulesetPath)
return nil, err
}
rulesVolumes[tempDir] = filepath.Join(RulesMountPath, filepath.Base(tempDir))
rulesVolumes[tempDir] = path.Join(RulesMountPath, filepath.Base(tempDir))
}
return rulesVolumes, nil
}
Expand Down Expand Up @@ -494,7 +494,7 @@ func (a *analyzeCommand) RunAnalysis(ctx context.Context, xmlOutputDir string) e
}

if xmlOutputDir != "" {
convertPath := filepath.Join(RulesetPath, "convert")
convertPath := path.Join(RulesetPath, "convert")
volumes[xmlOutputDir] = convertPath
// for cleanup purposes
a.tempDirs = append(a.tempDirs, xmlOutputDir)
Expand Down Expand Up @@ -593,7 +593,7 @@ func (a *analyzeCommand) GenerateStaticReport(ctx context.Context) error {
args := []string{
fmt.Sprintf("--analysis-output-list=%s", AnalysisOutputMountPath),
fmt.Sprintf("--deps-output-list=%s", DepsOutputMountPath),
fmt.Sprintf("--output-path=%s", filepath.Join("/usr/local/static-report/output.js")),
fmt.Sprintf("--output-path=%s", path.Join("/usr/local/static-report/output.js")),
fmt.Sprintf("--application-name-list=%s", filepath.Base(a.input)),
}

Expand Down Expand Up @@ -712,7 +712,7 @@ func (a *analyzeCommand) getXMLRulesVolumes(tempRuleDir string) (map[string]stri
return nil, err
}
} else {
rulesVolumes[r] = filepath.Join(XMLRulePath, filepath.Base(r))
rulesVolumes[r] = path.Join(XMLRulePath, filepath.Base(r))
}
}
if mountTempDir {
Expand Down
6 changes: 3 additions & 3 deletions cmd/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"math/rand"
"os"
"os/exec"
"path/filepath"
"path"
"runtime"
"strings"
"time"
Expand Down Expand Up @@ -169,10 +169,10 @@ func (c *container) Run(ctx context.Context, opts ...Option) error {
// TODO: check this on windows
if os == "linux" {
args = append(args, fmt.Sprintf("%s:%s:Z",
filepath.Clean(sourcePath), filepath.Clean(destPath)))
path.Clean(sourcePath), path.Clean(destPath)))
} else {
args = append(args, fmt.Sprintf("%s:%s",
filepath.Clean(sourcePath), filepath.Clean(destPath)))
path.Clean(sourcePath), path.Clean(destPath)))
}
}
for k, v := range c.env {
Expand Down
3 changes: 2 additions & 1 deletion cmd/shimconvert.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"os"
"path"
"path/filepath"
"strings"

Expand Down Expand Up @@ -108,7 +109,7 @@ func (w *windupShimCommand) getRulesVolumes(tempRuleDir string) (map[string]stri
return nil, err
}
} else {
rulesVolumes[r] = filepath.Join(XMLRulePath, filepath.Base(r))
rulesVolumes[r] = path.Join(XMLRulePath, filepath.Base(r))
}
}
if mountTempDir {
Expand Down

0 comments on commit fc2f170

Please sign in to comment.