Skip to content

Commit bee312e

Browse files
junkyjunky
authored
Merge pull request #72 from Smartling/go-modules-migration
Migration to Go Modules
2 parents c1591b3 + 69a7d0b commit bee312e

29 files changed

+117
-96
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MAINTAINER = Stanislav Seletskiy <s.seletskiy@gmail.com>
1+
MAINTAINER = Alex Koval <akoval@smartling.com>
22
DESCRIPTION = CLI for Smartling Platform
33

44
all: clean get build

‎README.md‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,3 @@ make MAINTAINER=<maintainer> <target>
3939

4040
An executable named `smartling-cli` should become available in your
4141
`$GOPATH/bin`.
42-
43-
44-
## Managing dependencies
45-
46-
Project uses [manul](https://github.com/kovetskiy/manul) vendoring tool,
47-
which uses vendoring through git-submodules.
48-
49-
After adding any third-party libraries, you need to update vendoring:
50-
51-
```
52-
manul -Ir
53-
```

‎config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package main
33
import (
44
"os"
55

6+
"dario.cat/mergo"
67
"github.com/gobwas/glob"
7-
"github.com/imdario/mergo"
88
"github.com/kovetskiy/ko"
99
"github.com/reconquest/hierr-go"
1010
"gopkg.in/yaml.v2"
@@ -22,8 +22,8 @@ type FileConfig struct {
2222
}
2323

2424
type Config struct {
25-
UserID string `yaml:"user_id",required:"true"`
26-
Secret string `yaml:"secret",required:"true"`
25+
UserID string `yaml:"user_id" required:"true"`
26+
Secret string `yaml:"secret" required:"true"`
2727
AccountID string `yaml:"account_id"`
2828
ProjectID string `yaml:"project_id,omitempty"`
2929
Threads int `yaml:"threads"`

‎do_init.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import (
44
"bytes"
55
"errors"
66
"fmt"
7-
"io/ioutil"
87
"os"
98
"regexp"
109

11-
"github.com/Smartling/api-sdk-go"
10+
smartling "github.com/Smartling/api-sdk-go"
1211
"github.com/reconquest/hierr-go"
1312
"github.com/tcnksm/go-input"
1413
)
@@ -124,14 +123,14 @@ func doInit(config Config, args map[string]interface{}) error {
124123
if err != nil {
125124
if _, ok := err.(smartling.NotAuthorizedError); ok {
126125
return NewError(
127-
errors.New("Not authorized."),
126+
errors.New("not authorized"),
128127
"Your credentials are invalid. Double check them and run "+
129-
"init command again.",
128+
"init command again",
130129
)
131130
} else {
132131
return NewError(
133132
hierr.Errorf(err, "failure while testing connection"),
134-
"Contact developer for more info.",
133+
"Contact developer for more info",
135134
)
136135
}
137136
}
@@ -146,7 +145,7 @@ func doInit(config Config, args map[string]interface{}) error {
146145

147146
fmt.Println(result.String())
148147
} else {
149-
err = ioutil.WriteFile(config.path, result.Bytes(), 0644)
148+
err = os.WriteFile(config.path, result.Bytes(), 0644)
150149
if err != nil {
151150
return hierr.Errorf(
152151
err,

‎do_projects_info.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/Smartling/api-sdk-go"
7+
smartling "github.com/Smartling/api-sdk-go"
88
"github.com/reconquest/hierr-go"
99
)
1010

11-
func doProjectsInfo(
12-
client *smartling.Client,
13-
config Config,
14-
args map[string]interface{},
15-
) error {
11+
func doProjectsInfo(client *smartling.Client, config Config) error {
1612
details, err := client.GetProjectDetails(config.ProjectID)
1713
if err != nil {
1814
if _, ok := err.(smartling.NotFoundError); ok {

‎download_file.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/Smartling/api-sdk-go"
8+
smartling "github.com/Smartling/api-sdk-go"
99
"github.com/reconquest/hierr-go"
1010
)
1111

‎download_file_translations.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strconv"
77
"strings"
88

9-
"github.com/Smartling/api-sdk-go"
9+
smartling "github.com/Smartling/api-sdk-go"
1010
"github.com/reconquest/hierr-go"
1111
)
1212

@@ -136,7 +136,7 @@ func downloadFileTranslations(
136136

137137
func hasLocaleInList(locale string, locales []string) bool {
138138
for _, filter := range locales {
139-
if strings.ToLower(filter) == strings.ToLower(locale) {
139+
if strings.EqualFold(strings.ToLower(filter), strings.ToLower(locale)) {
140140
return true
141141
}
142142
}

‎go.mod‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
module github.com/Smartling/smartling-cli
2+
3+
go 1.22.3
4+
5+
require (
6+
dario.cat/mergo v1.0.0
7+
github.com/Smartling/api-sdk-go v0.0.0-20240531162953-75664a8dc8d1
8+
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
9+
github.com/gobwas/glob v0.2.3
10+
github.com/kovetskiy/ko v1.6.1
11+
github.com/kovetskiy/lorg v1.2.0
12+
github.com/reconquest/hierr-go v0.0.0-20170824213838-7d09c0176fd2
13+
github.com/stretchr/testify v1.8.2
14+
github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8
15+
gopkg.in/yaml.v2 v2.4.0
16+
)
17+
18+
require (
19+
github.com/BurntSushi/toml v1.4.0 // indirect
20+
github.com/davecgh/go-spew v1.1.1 // indirect
21+
github.com/iancoleman/strcase v0.3.0 // indirect
22+
github.com/pmezard/go-difflib v1.0.0 // indirect
23+
github.com/reconquest/karma-go v1.4.0 // indirect
24+
github.com/stretchr/objx v0.5.0 // indirect
25+
github.com/zazab/zhash v0.0.0-20221031090444-2b0d50417446 // indirect
26+
golang.org/x/crypto v0.23.0 // indirect
27+
golang.org/x/sys v0.20.0 // indirect
28+
golang.org/x/term v0.20.0 // indirect
29+
gopkg.in/yaml.v3 v3.0.1 // indirect
30+
)

‎go.sum‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
2+
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
3+
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
4+
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
5+
github.com/Smartling/api-sdk-go v0.0.0-20240531162953-75664a8dc8d1 h1:pNkvlspwtmJZ2lXFaoT3uxAer6uuWUkI/SpbdmAirFU=
6+
github.com/Smartling/api-sdk-go v0.0.0-20240531162953-75664a8dc8d1/go.mod h1:Uu7XGCVLASRHzJN8crKL+fe0W9Moeu0vyZycfFkQbDc=
7+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
9+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
10+
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
11+
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
12+
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
13+
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
14+
github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
15+
github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
16+
github.com/kovetskiy/ko v1.6.1 h1:EO5v6CrW6x6vzxo7CKbN0r+foIRjz06U6wVSgxUVqMc=
17+
github.com/kovetskiy/ko v1.6.1/go.mod h1:WH6doo9XYpbDWe9HsELro1vXAfXCM4ByG5arIp9JjDE=
18+
github.com/kovetskiy/lorg v1.2.0 h1:wNIUT/VOhcjKOmizDClZLvchbKFGW+dzf9fQXbSVS5E=
19+
github.com/kovetskiy/lorg v1.2.0/go.mod h1:rdiamaIRUCkX9HtFZd0D9dQqUbad21hipHk+sat7Z6s=
20+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
21+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
22+
github.com/reconquest/hierr-go v0.0.0-20170824213838-7d09c0176fd2 h1:v3ctQXyIHprCI7s42LGmMYbulnnpjeD4zcvq78D1ung=
23+
github.com/reconquest/hierr-go v0.0.0-20170824213838-7d09c0176fd2/go.mod h1:dF8sYs86hXr+kKjDVvxDZYMUsTm5yr0PFQqLer/xsrk=
24+
github.com/reconquest/karma-go v1.4.0 h1:N9owhvaIE7f3eejOe7Y5Icp/La4faRqhcqEWRDyNoi0=
25+
github.com/reconquest/karma-go v1.4.0/go.mod h1:52XRXXa2ec/VNrlCirwasdJfNmjI1O87q098gmqILh0=
26+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
27+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
28+
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
29+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
30+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
31+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
32+
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
33+
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
34+
github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8 h1:RB0v+/pc8oMzPsN97aZYEwNuJ6ouRJ2uhjxemJ9zvrY=
35+
github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8/go.mod h1:IlWNj9v/13q7xFbaK4mbyzMNwrZLaWSHx/aibKIZuIg=
36+
github.com/zazab/zhash v0.0.0-20221031090444-2b0d50417446 h1:75pcOSsb40+ub185cJI7g5uykl9Uu76rD5ONzK/4s40=
37+
github.com/zazab/zhash v0.0.0-20221031090444-2b0d50417446/go.mod h1:NtepZ8TEXErPsmQDMUoN72f8aIy4+xNinSJ3f1giess=
38+
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
39+
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
40+
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
41+
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
42+
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
43+
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
44+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
45+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
46+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
47+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
48+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
49+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
50+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)