Skip to content

Commit b4db45c

Browse files
vania-poohvania-pooh
committed
Formatted code
1 parent d6f2eec commit b4db45c

File tree

6 files changed

+56
-58
lines changed

6 files changed

+56
-58
lines changed

‎cmd/data.go‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,60 +5,59 @@ import "encoding/xml"
55
// Input data
66

77
type JsonHost struct {
8-
Port int `json:"port"`
8+
Port int `json:"port"`
99
Count int `json:"count"`
1010
}
1111

12-
type JsonRegion map[string] JsonHost
12+
type JsonRegion map[string]JsonHost
1313

1414
type JsonRegions map[string]JsonRegion
1515

1616
type JsonHosts map[string]JsonRegions
1717

18-
type JsonVersions map[string] string
18+
type JsonVersions map[string]string
1919

2020
type JsonBrowser struct {
21-
DefaultVersion string `json:"defaultVersion"`
21+
DefaultVersion string `json:"defaultVersion"`
2222
Versions JsonVersions `json:"versions"`
2323
}
2424

2525
type JsonQuota map[string]JsonBrowser
2626

2727
type JsonInput struct {
28-
Hosts JsonHosts `json:"hosts"`
29-
Quota map[string]JsonQuota `json:"quota"`
30-
Aliases map[string] []string `json:"aliases"`
28+
Hosts JsonHosts `json:"hosts"`
29+
Quota map[string]JsonQuota `json:"quota"`
30+
Aliases map[string][]string `json:"aliases"`
3131
}
3232

3333
// Output data
3434

3535
type XmlBrowsers struct {
36-
XMLName xml.Name `xml:"qa:browsers"`
37-
XmlNS string `xml:"xmlns:qa,attr"`
36+
XMLName xml.Name `xml:"qa:browsers"`
37+
XmlNS string `xml:"xmlns:qa,attr"`
3838
Browsers []XmlBrowser `xml:"browser"`
3939
}
4040

4141
type XmlBrowser struct {
42-
Name string `xml:"name,attr"`
43-
DefaultVersion string `xml:"defaultVersion,attr"`
42+
Name string `xml:"name,attr"`
43+
DefaultVersion string `xml:"defaultVersion,attr"`
4444
Versions []XmlVersion `xml:"version"`
4545
}
4646

4747
type XmlVersion struct {
48-
Number string `xml:"number,attr"`
48+
Number string `xml:"number,attr"`
4949
Regions []XmlRegion `xml:"region"`
5050
}
5151

5252
type XmlHosts []XmlHost
5353

5454
type XmlRegion struct {
55-
Name string `xml:"name,attr"`
56-
Hosts XmlHosts `xml:"host"`
55+
Name string `xml:"name,attr"`
56+
Hosts XmlHosts `xml:"host"`
5757
}
5858

5959
type XmlHost struct {
60-
Name string `xml:"name,attr"`
61-
Port int `xml:"port,attr"`
62-
Count int `xml:"count,attr"`
60+
Name string `xml:"name,attr"`
61+
Port int `xml:"port,attr"`
62+
Count int `xml:"count,attr"`
6363
}
64-

‎cmd/generate.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package cmd
22

33
import (
4-
"github.com/spf13/cobra"
54
"encoding/json"
6-
"fmt"
75
"encoding/xml"
8-
"path"
6+
"errors"
7+
"fmt"
8+
"github.com/spf13/cobra"
99
"io/ioutil"
10-
"regexp"
1110
"os"
12-
"errors"
13-
"strconv"
11+
"path"
12+
"regexp"
1413
"sort"
14+
"strconv"
1515
)
1616

1717
const (
@@ -20,15 +20,15 @@ const (
2020

2121
var (
2222
outputDirectory string
23-
dryRun bool
23+
dryRun bool
2424
)
2525

2626
var generateCmd = &cobra.Command{
2727
Use: "generate",
2828
Short: "Generate XML quota using JSON input file",
2929
Run: func(cmd *cobra.Command, args []string) {
3030
input, err := parseInputFile(inputFilePath)
31-
if (err != nil) {
31+
if err != nil {
3232
fmt.Println(err.Error())
3333
os.Exit(1)
3434
}
@@ -53,8 +53,8 @@ func init() {
5353
generateCmd.PersistentFlags().BoolVar(&dryRun, "dryRun", false, "whether to send output to stdout instead of writing files")
5454
}
5555

56-
func convert(input JsonInput) map[string] XmlBrowsers {
57-
ret := make(map[string] XmlBrowsers)
56+
func convert(input JsonInput) map[string]XmlBrowsers {
57+
ret := make(map[string]XmlBrowsers)
5858
hostsMap := input.Hosts
5959
quotaMap := input.Quota
6060
aliasesMap := input.Aliases
@@ -80,9 +80,9 @@ func createQuota(quotaName string, hostsMap JsonHosts, quota JsonQuota) XmlBrows
8080
xmlVersions := []XmlVersion{}
8181
for versionName, hostsRef := range browser.Versions {
8282
regions := hostsMap[hostsRef]
83-
if (regions != nil) {
83+
if regions != nil {
8484
xmlVersion := XmlVersion{
85-
Number: versionName,
85+
Number: versionName,
8686
Regions: jsonRegionsToXmlRegions(regions),
8787
}
8888
xmlVersions = append(xmlVersions, xmlVersion)
@@ -92,15 +92,15 @@ func createQuota(quotaName string, hostsMap JsonHosts, quota JsonQuota) XmlBrows
9292
}
9393
}
9494
xmlBrowser := XmlBrowser{
95-
Name: browserName,
95+
Name: browserName,
9696
DefaultVersion: browser.DefaultVersion,
97-
Versions: xmlVersions,
97+
Versions: xmlVersions,
9898
}
9999
browsers = append(browsers, xmlBrowser)
100100
}
101101
return XmlBrowsers{
102102
Browsers: browsers,
103-
XmlNS: "urn:config.gridrouter.qatools.ru",
103+
XmlNS: "urn:config.gridrouter.qatools.ru",
104104
}
105105
}
106106

@@ -112,14 +112,14 @@ func jsonRegionsToXmlRegions(regions JsonRegions) []XmlRegion {
112112
hostNames := parseHostPattern(hostPattern)
113113
for _, hostName := range hostNames {
114114
xmlHosts = append(xmlHosts, XmlHost{
115-
Name: hostName,
116-
Port: host.Port,
115+
Name: hostName,
116+
Port: host.Port,
117117
Count: host.Count,
118118
})
119119
}
120120
}
121121
xmlRegions = append(xmlRegions, XmlRegion{
122-
Name: regionName,
122+
Name: regionName,
123123
Hosts: xmlHosts,
124124
})
125125
}
@@ -143,8 +143,8 @@ func marshalBrowsers(browsers XmlBrowsers) ([]byte, error) {
143143
}
144144

145145
func output(quotaName string, browsers XmlBrowsers, outputDirectory string) error {
146-
filePath := path.Join(outputDirectory, quotaName + ".xml")
147-
if (dryRun) {
146+
filePath := path.Join(outputDirectory, quotaName+".xml")
147+
if dryRun {
148148
return printOutputFile(filePath, browsers)
149149
} else {
150150
return saveOutputFile(filePath, browsers)
@@ -153,7 +153,7 @@ func output(quotaName string, browsers XmlBrowsers, outputDirectory string) erro
153153

154154
func printOutputFile(filePath string, browsers XmlBrowsers) error {
155155
bytes, err := marshalBrowsers(browsers)
156-
if (err != nil) {
156+
if err != nil {
157157
return err
158158
}
159159
fmt.Println(filePath)
@@ -165,7 +165,7 @@ func printOutputFile(filePath string, browsers XmlBrowsers) error {
165165

166166
func saveOutputFile(filePath string, browsers XmlBrowsers) error {
167167
bytes, err := marshalBrowsers(browsers)
168-
if (err != nil) {
168+
if err != nil {
169169
return err
170170
}
171171
if err := ioutil.WriteFile(filePath, bytes, fileMode); err != nil {
@@ -183,7 +183,7 @@ func parseHostPattern(pattern string) []string {
183183
from, _ := strconv.Atoi(pieces[2])
184184
to, _ := strconv.Atoi(pieces[3])
185185
tail := pieces[4]
186-
if (from <= to) {
186+
if from <= to {
187187
ret := []string{}
188188
for i := from; i <= to; i++ {
189189
ret = append(ret, fmt.Sprintf("%s%d%s", head, i, tail))
@@ -192,4 +192,4 @@ func parseHostPattern(pattern string) []string {
192192
}
193193
}
194194
return []string{pattern}
195-
}
195+
}

‎cmd/generate_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cmd
22

33
import (
4-
"testing"
54
. "github.com/aandryashin/matchers"
5+
"testing"
66
)
77

88
func TestParseInputFile(t *testing.T) {
@@ -29,29 +29,29 @@ func TestConvert(t *testing.T) {
2929
browser := browsers[0]
3030
AssertThat(t, browser.Name, EqualTo{"firefox"})
3131
AssertThat(t, browser.DefaultVersion, EqualTo{"33.0"})
32-
32+
3333
versions := browser.Versions
3434
AssertThat(t, len(versions), EqualTo{2})
3535
firstVersion := versions[0]
3636
AssertThat(t, firstVersion.Number == "33.0" || firstVersion.Number == "42.0", Is{true})
3737
secondVersion := versions[1]
38-
if (firstVersion.Number == "42.0") {
38+
if firstVersion.Number == "42.0" {
3939
AssertThat(t, secondVersion.Number, EqualTo{"33.0"})
4040
} else {
4141
AssertThat(t, secondVersion.Number, EqualTo{"42.0"})
4242
}
43-
43+
4444
regions := firstVersion.Regions
4545
AssertThat(t, len(regions), EqualTo{2})
4646
firstRegion := regions[0]
4747
AssertThat(t, firstRegion.Name == "region-a" || firstRegion.Name == "region-b", Is{true})
48-
48+
4949
secondRegion := regions[1]
50-
if (firstRegion.Name == "region-a") {
50+
if firstRegion.Name == "region-a" {
5151
AssertThat(t, secondRegion.Name, EqualTo{"region-b"})
5252
} else {
5353
AssertThat(t, secondRegion.Name, EqualTo{"region-a"})
5454
}
5555
AssertThat(t, len(firstRegion.Hosts), EqualTo{20})
5656
AssertThat(t, len(secondRegion.Hosts), EqualTo{20})
57-
}
57+
}

‎cmd/sctl.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
var (
99
inputFilePath string
10-
sctlCmd = &cobra.Command{
10+
sctlCmd = &cobra.Command{
1111
Use: "sctl",
1212
Short: "sctl is a Selenium configuration management tool",
1313
RunE: func(cmd *cobra.Command, args []string) error {
@@ -27,4 +27,4 @@ func Execute() {
2727

2828
func initCommonFlags(cmd *cobra.Command) {
2929
cmd.PersistentFlags().StringVar(&inputFilePath, "inputFile", "input.json", "path to input file")
30-
}
30+
}

‎cmd/stat.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cmd
22

33
import (
4-
"github.com/spf13/cobra"
54
"fmt"
5+
"github.com/spf13/cobra"
66
"os"
77
)
88

@@ -13,7 +13,7 @@ var statCmd = &cobra.Command{
1313
Short: "Show quota statistics using JSON input file",
1414
Run: func(cmd *cobra.Command, args []string) {
1515
input, err := parseInputFile(inputFilePath)
16-
if (err != nil) {
16+
if err != nil {
1717
fmt.Println(err.Error())
1818
os.Exit(1)
1919
}
@@ -42,7 +42,7 @@ func printStat(input JsonInput, quotaName string) {
4242
}
4343
}
4444

45-
if (len(quotaName) > 0) {
45+
if len(quotaName) > 0 {
4646
if _, ok := quotaMap[quotaName]; ok {
4747
processJsonQuota(quotaName, quotaMap[quotaName], hostsMap)
4848
} else {
@@ -63,7 +63,7 @@ func processJsonQuota(quotaName string, quota JsonQuota, hostsMap JsonHosts) {
6363
for browserName, browser := range quota {
6464
for versionName, hostsRef := range browser.Versions {
6565
regions := hostsMap[hostsRef]
66-
if (regions != nil) {
66+
if regions != nil {
6767
regionsStat := ""
6868
for regionName, region := range regions {
6969
regionTotal := 0
@@ -73,7 +73,7 @@ func processJsonQuota(quotaName string, quota JsonQuota, hostsMap JsonHosts) {
7373
}
7474
regionsStat += fmt.Sprintf(" %s = %d", regionName, regionTotal)
7575
}
76-
if (len(regionsStat) > 0) {
76+
if len(regionsStat) > 0 {
7777
fmt.Printf("%s %s%s\n", browserName, versionName, regionsStat)
7878
}
7979
}
@@ -82,4 +82,3 @@ func processJsonQuota(quotaName string, quota JsonQuota, hostsMap JsonHosts) {
8282
fmt.Println()
8383

8484
}
85-

‎sctl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ func init() {
1111

1212
func main() {
1313
cmd.Execute()
14-
}
14+
}

0 commit comments

Comments
 (0)