Skip to content

Commit 894c81f

Browse files
darkweaver87darkweaver87
committed
fix: formatting
1 parent c119dc0 commit 894c81f

File tree

9 files changed

+1658
-1658
lines changed

9 files changed

+1658
-1658
lines changed

‎cmd/serve/command.go

Lines changed: 123 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,148 +1,148 @@
11
package serve
22

33
import (
4-
"github.com/ettle/strcase"
5-
"github.com/traefik/plugin-service/cmd/internal"
6-
"github.com/traefik/plugin-service/pkg/tracer"
7-
"github.com/urfave/cli/v2"
4+
"github.com/ettle/strcase"
5+
"github.com/traefik/plugin-service/cmd/internal"
6+
"github.com/traefik/plugin-service/pkg/tracer"
7+
"github.com/urfave/cli/v2"
88
)
99

1010
const (
11-
flagAddr = "addr"
12-
flagTTL = "ttl"
13-
flagGHToken = "github-token"
11+
flagAddr = "addr"
12+
flagTTL = "ttl"
13+
flagGHToken = "github-token"
1414

15-
flagTraceServiceURL = "trace-service-url"
15+
flagTraceServiceURL = "trace-service-url"
1616

17-
flagGoProxyURL = "go-proxy-url"
18-
flagGoProxyUsername = "go-proxy-username"
19-
flagGoProxyPassword = "go-proxy-password"
17+
flagGoProxyURL = "go-proxy-url"
18+
flagGoProxyUsername = "go-proxy-username"
19+
flagGoProxyPassword = "go-proxy-password"
2020

21-
flagTracingAddress = "tracing-address"
22-
flagTracingInsecure = "tracing-insecure"
23-
flagTracingUsername = "tracing-username"
24-
flagTracingPassword = "tracing-password"
25-
flagTracingProbability = "tracing-probability"
21+
flagTracingAddress = "tracing-address"
22+
flagTracingInsecure = "tracing-insecure"
23+
flagTracingUsername = "tracing-username"
24+
flagTracingPassword = "tracing-password"
25+
flagTracingProbability = "tracing-probability"
2626
)
2727

2828
// Command creates the command for serving the plugin service.
2929
func Command() *cli.Command {
30-
cmd := &cli.Command{
31-
Name: "serve",
32-
Usage: "Serve HTTP",
33-
Description: "Launch plugin service application",
34-
Flags: []cli.Flag{
35-
&cli.StringFlag{
36-
Name: flagAddr,
37-
Usage: "Addr to listen on.",
38-
EnvVars: []string{strcase.ToSNAKE(flagAddr)},
39-
},
40-
&cli.StringFlag{
41-
Name: flagTTL,
42-
Usage: "Control TTL of download responses.",
43-
EnvVars: []string{strcase.ToSNAKE(flagTTL)},
44-
},
45-
&cli.StringFlag{
46-
Name: flagGHToken,
47-
Usage: "GitHub Token",
48-
EnvVars: []string{strcase.ToSNAKE(flagGHToken)},
49-
Required: true,
50-
},
51-
&cli.StringFlag{
52-
Name: flagTraceServiceURL,
53-
Usage: "URL of the trace service",
54-
EnvVars: []string{strcase.ToSNAKE(flagTraceServiceURL)},
55-
},
56-
},
57-
Action: func(cliCtx *cli.Context) error {
58-
return run(cliCtx.Context, buildConfig(cliCtx))
59-
},
60-
}
30+
cmd := &cli.Command{
31+
Name: "serve",
32+
Usage: "Serve HTTP",
33+
Description: "Launch plugin service application",
34+
Flags: []cli.Flag{
35+
&cli.StringFlag{
36+
Name: flagAddr,
37+
Usage: "Addr to listen on.",
38+
EnvVars: []string{strcase.ToSNAKE(flagAddr)},
39+
},
40+
&cli.StringFlag{
41+
Name: flagTTL,
42+
Usage: "Control TTL of download responses.",
43+
EnvVars: []string{strcase.ToSNAKE(flagTTL)},
44+
},
45+
&cli.StringFlag{
46+
Name: flagGHToken,
47+
Usage: "GitHub Token",
48+
EnvVars: []string{strcase.ToSNAKE(flagGHToken)},
49+
Required: true,
50+
},
51+
&cli.StringFlag{
52+
Name: flagTraceServiceURL,
53+
Usage: "URL of the trace service",
54+
EnvVars: []string{strcase.ToSNAKE(flagTraceServiceURL)},
55+
},
56+
},
57+
Action: func(cliCtx *cli.Context) error {
58+
return run(cliCtx.Context, buildConfig(cliCtx))
59+
},
60+
}
6161

62-
cmd.Flags = append(cmd.Flags, goProxyFlags()...)
63-
cmd.Flags = append(cmd.Flags, tracingFlags()...)
64-
cmd.Flags = append(cmd.Flags, internal.MongoFlags()...)
62+
cmd.Flags = append(cmd.Flags, goProxyFlags()...)
63+
cmd.Flags = append(cmd.Flags, tracingFlags()...)
64+
cmd.Flags = append(cmd.Flags, internal.MongoFlags()...)
6565

66-
return cmd
66+
return cmd
6767
}
6868

6969
func buildConfig(cliCtx *cli.Context) Config {
70-
return Config{
71-
MongoDB: internal.BuildMongoConfig(cliCtx),
72-
Tracing: tracer.Config{
73-
Address: cliCtx.String(flagTracingAddress),
74-
Insecure: cliCtx.Bool(flagTracingInsecure),
75-
Username: cliCtx.String(flagTracingUsername),
76-
Password: cliCtx.String(flagTracingPassword),
77-
Probability: cliCtx.Float64(flagTracingProbability),
78-
ServiceName: "plugin-service",
79-
},
80-
TraceURL: cliCtx.String(flagTraceServiceURL),
81-
Addr: cliCtx.String(flagAddr),
82-
GitHubToken: cliCtx.String(flagGHToken),
83-
GoProxy: GoProxy{
84-
URL: cliCtx.String(flagGoProxyURL),
85-
Username: cliCtx.String(flagGoProxyUsername),
86-
Password: cliCtx.String(flagGoProxyPassword),
87-
},
88-
TTL: cliCtx.Duration(flagTTL),
89-
}
70+
return Config{
71+
MongoDB: internal.BuildMongoConfig(cliCtx),
72+
Tracing: tracer.Config{
73+
Address: cliCtx.String(flagTracingAddress),
74+
Insecure: cliCtx.Bool(flagTracingInsecure),
75+
Username: cliCtx.String(flagTracingUsername),
76+
Password: cliCtx.String(flagTracingPassword),
77+
Probability: cliCtx.Float64(flagTracingProbability),
78+
ServiceName: "plugin-service",
79+
},
80+
TraceURL: cliCtx.String(flagTraceServiceURL),
81+
Addr: cliCtx.String(flagAddr),
82+
GitHubToken: cliCtx.String(flagGHToken),
83+
GoProxy: GoProxy{
84+
URL: cliCtx.String(flagGoProxyURL),
85+
Username: cliCtx.String(flagGoProxyUsername),
86+
Password: cliCtx.String(flagGoProxyPassword),
87+
},
88+
TTL: cliCtx.Duration(flagTTL),
89+
}
9090
}
9191

9292
func goProxyFlags() []cli.Flag {
93-
return []cli.Flag{
94-
&cli.StringFlag{
95-
Name: flagGoProxyURL,
96-
Usage: "Go Proxy URL",
97-
EnvVars: []string{strcase.ToSNAKE(flagGoProxyURL)},
98-
Required: true,
99-
},
100-
&cli.StringFlag{
101-
Name: flagGoProxyUsername,
102-
Usage: "Go Proxy Username",
103-
EnvVars: []string{strcase.ToSNAKE(flagGoProxyUsername)},
104-
Required: true,
105-
},
106-
&cli.StringFlag{
107-
Name: flagGoProxyPassword,
108-
Usage: "Go Proxy Password",
109-
EnvVars: []string{strcase.ToSNAKE(flagGoProxyPassword)},
110-
Required: true,
111-
},
112-
}
93+
return []cli.Flag{
94+
&cli.StringFlag{
95+
Name: flagGoProxyURL,
96+
Usage: "Go Proxy URL",
97+
EnvVars: []string{strcase.ToSNAKE(flagGoProxyURL)},
98+
Required: true,
99+
},
100+
&cli.StringFlag{
101+
Name: flagGoProxyUsername,
102+
Usage: "Go Proxy Username",
103+
EnvVars: []string{strcase.ToSNAKE(flagGoProxyUsername)},
104+
Required: true,
105+
},
106+
&cli.StringFlag{
107+
Name: flagGoProxyPassword,
108+
Usage: "Go Proxy Password",
109+
EnvVars: []string{strcase.ToSNAKE(flagGoProxyPassword)},
110+
Required: true,
111+
},
112+
}
113113
}
114114

115115
func tracingFlags() []cli.Flag {
116-
return []cli.Flag{
117-
&cli.StringFlag{
118-
Name: flagTracingAddress,
119-
Usage: "Address to send traces",
120-
EnvVars: []string{strcase.ToSNAKE(flagTracingAddress)},
121-
Value: "jaeger.jaeger.svc.cluster.local:4318",
122-
},
123-
&cli.BoolFlag{
124-
Name: flagTracingInsecure,
125-
Usage: "use HTTP instead of HTTPS",
126-
EnvVars: []string{strcase.ToSNAKE(flagTracingInsecure)},
127-
Value: true,
128-
},
129-
&cli.StringFlag{
130-
Name: flagTracingUsername,
131-
Usage: "Username to connect to Jaeger",
132-
EnvVars: []string{strcase.ToSNAKE(flagTracingUsername)},
133-
Value: "jaeger",
134-
},
135-
&cli.StringFlag{
136-
Name: flagTracingPassword,
137-
Usage: "Password to connect to Jaeger",
138-
EnvVars: []string{strcase.ToSNAKE(flagTracingPassword)},
139-
Value: "jaeger",
140-
},
141-
&cli.Float64Flag{
142-
Name: flagTracingProbability,
143-
Usage: "Probability to send traces",
144-
EnvVars: []string{strcase.ToSNAKE(flagTracingProbability)},
145-
Value: 0,
146-
},
147-
}
116+
return []cli.Flag{
117+
&cli.StringFlag{
118+
Name: flagTracingAddress,
119+
Usage: "Address to send traces",
120+
EnvVars: []string{strcase.ToSNAKE(flagTracingAddress)},
121+
Value: "jaeger.jaeger.svc.cluster.local:4318",
122+
},
123+
&cli.BoolFlag{
124+
Name: flagTracingInsecure,
125+
Usage: "use HTTP instead of HTTPS",
126+
EnvVars: []string{strcase.ToSNAKE(flagTracingInsecure)},
127+
Value: true,
128+
},
129+
&cli.StringFlag{
130+
Name: flagTracingUsername,
131+
Usage: "Username to connect to Jaeger",
132+
EnvVars: []string{strcase.ToSNAKE(flagTracingUsername)},
133+
Value: "jaeger",
134+
},
135+
&cli.StringFlag{
136+
Name: flagTracingPassword,
137+
Usage: "Password to connect to Jaeger",
138+
EnvVars: []string{strcase.ToSNAKE(flagTracingPassword)},
139+
Value: "jaeger",
140+
},
141+
&cli.Float64Flag{
142+
Name: flagTracingProbability,
143+
Usage: "Probability to send traces",
144+
EnvVars: []string{strcase.ToSNAKE(flagTracingProbability)},
145+
Value: 0,
146+
},
147+
}
148148
}

‎cmd/serve/config.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
package serve
22

33
import (
4-
"time"
4+
"time"
55

6-
"github.com/traefik/plugin-service/pkg/db/mongodb"
7-
"github.com/traefik/plugin-service/pkg/tracer"
6+
"github.com/traefik/plugin-service/pkg/db/mongodb"
7+
"github.com/traefik/plugin-service/pkg/tracer"
88
)
99

1010
// Config holds the serve configuration.
1111
type Config struct {
12-
Addr string
13-
GitHubToken string
12+
Addr string
13+
GitHubToken string
1414

15-
TraceURL string
15+
TraceURL string
1616

17-
MongoDB mongodb.Config
18-
Tracing tracer.Config
19-
GoProxy GoProxy
17+
MongoDB mongodb.Config
18+
Tracing tracer.Config
19+
GoProxy GoProxy
2020

21-
TTL time.Duration
21+
TTL time.Duration
2222
}
2323

2424
// GoProxy holds the go-proxy configuration.
2525
type GoProxy struct {
26-
URL string
27-
Username string
28-
Password string
26+
URL string
27+
Username string
28+
Password string
2929
}

0 commit comments

Comments
 (0)