fix linting issues
Signed-off-by: Tihomir Jovicic <tihomir.jovicic.develop@gmail.com>
This commit is contained in:
parent
0010609f4d
commit
92e6e693f5
@ -45,7 +45,7 @@ type require struct {
|
||||
version string
|
||||
}
|
||||
|
||||
func (r *require) cloneUrl() string {
|
||||
func (r *require) cloneURL() string {
|
||||
return fmt.Sprintf("%s%s", r.prefix, r.repo)
|
||||
}
|
||||
|
||||
@ -122,10 +122,7 @@ func parseArgument(arg string) (*require, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
repoPath, version, err := parseGithubRepoVersion(suffix)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
repoPath, version := parseGithubRepoVersion(suffix)
|
||||
|
||||
return &require{
|
||||
prefix: "https://",
|
||||
@ -151,17 +148,17 @@ func parseGithubRepoName(arg string) (string, string, error) {
|
||||
return repoMatches[1], repoMatches[2], nil
|
||||
}
|
||||
|
||||
func parseGithubRepoVersion(repoSuffix string) (string, string, error) {
|
||||
func parseGithubRepoVersion(repoSuffix string) (string, string) {
|
||||
if repoSuffix == "" {
|
||||
return "", "", nil
|
||||
return "", ""
|
||||
}
|
||||
|
||||
i := strings.LastIndexAny(repoSuffix, "@:")
|
||||
if i == -1 {
|
||||
return repoSuffix, "", nil
|
||||
return repoSuffix, ""
|
||||
}
|
||||
|
||||
return repoSuffix[:i], repoSuffix[i+1:], nil
|
||||
return repoSuffix[:i], repoSuffix[i+1:]
|
||||
}
|
||||
|
||||
func readModFile() (*file, error) {
|
||||
@ -179,7 +176,7 @@ func readModFile() (*file, error) {
|
||||
}
|
||||
|
||||
func writeModFile(f *file) error {
|
||||
return ioutil.WriteFile("./cue.mod/module.cue", f.contents().Bytes(), 0644)
|
||||
return ioutil.WriteFile("./cue.mod/module.cue", f.contents().Bytes(), 0600)
|
||||
}
|
||||
|
||||
func move(r *require, sourceRepoPath, destBasePath string) error {
|
||||
|
@ -18,7 +18,7 @@ type repo struct {
|
||||
|
||||
func clone(require *require, dir string) (*repo, error) {
|
||||
r, err := git.PlainClone(dir, false, &git.CloneOptions{
|
||||
URL: require.cloneUrl(),
|
||||
URL: require.cloneURL(),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
@ -2,7 +2,6 @@ package mod
|
||||
|
||||
import "github.com/spf13/cobra"
|
||||
|
||||
|
||||
// Cmd exposes the top-level command
|
||||
var Cmd = &cobra.Command{
|
||||
Use: "mod",
|
||||
@ -14,4 +13,3 @@ func init() {
|
||||
getCmd,
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"go.dagger.io/dagger/cmd/dagger/cmd/mod"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
@ -9,6 +8,7 @@ import (
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/spf13/viper"
|
||||
"go.dagger.io/dagger/cmd/dagger/cmd/input"
|
||||
"go.dagger.io/dagger/cmd/dagger/cmd/mod"
|
||||
"go.dagger.io/dagger/cmd/dagger/cmd/output"
|
||||
"go.dagger.io/dagger/cmd/dagger/logger"
|
||||
"go.dagger.io/dagger/keychain"
|
||||
|
Reference in New Issue
Block a user