github/drone-plugin-lib
0
0
Fork 0
mirror of https://github.com/thegeeklab/drone-plugin-lib.git synced 2024-06-18 11:50:51 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9 from drone-plugins/better-separation

Browse Source 
Better separation of network, logging and pipeline
This commit is contained in:
Thomas Boerger 2020-01-20 23:05:43 +01:00 committed by GitHub
commit 7d346ea6f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drone/pipeline.go
View File

@ -9,7 +9,6 @@ package drone
// //
// Represents the full Drone environment that the plugin is executing in. // Represents the full Drone environment that the plugin is executing in.
type Pipeline struct { type Pipeline struct {
Network Network
Build Build Build Build
Repo Repo Repo Repo
Commit Commit Commit Commit

4
urfave/logging.go
View File

@ -21,8 +21,8 @@ func loggingFlags() []cli.Flag {
} }
} }
// loggingFromContext sets the logrus logging level. // LoggingFromContext sets the logrus logging level.
func loggingFromContext(ctx *cli.Context) { func LoggingFromContext(ctx *cli.Context) {
lvl, err := logrus.ParseLevel(ctx.String("log-level")) lvl, err := logrus.ParseLevel(ctx.String("log-level"))
if err != nil { if err != nil {

4
urfave/network.go
View File

@ -29,8 +29,8 @@ func networkFlags() []cli.Flag {
} }
} }
// networkFromContext creates a drone.Network from the cli.Context. // NetworkFromContext creates a drone.Network from the cli.Context.
func networkFromContext(c *cli.Context) drone.Network { func NetworkFromContext(c *cli.Context) drone.Network {
dialer := &net.Dialer{ dialer := &net.Dialer{
Timeout: 30 * time.Second, Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second, KeepAlive: 30 * time.Second,

7
urfave/urfave.go
View File

@ -27,12 +27,9 @@ func Flags() []cli.Flag {
return flags return flags
} }
// FromContext creates a drone.Pipeline from the cli.Context. // PipelineFromContext creates a drone.Pipeline from the cli.Context.
func FromContext(ctx *cli.Context) drone.Pipeline { func PipelineFromContext(ctx *cli.Context) drone.Pipeline {
loggingFromContext(ctx)
return drone.Pipeline{ return drone.Pipeline{
Network: networkFromContext(ctx),
Build: buildFromContext(ctx), Build: buildFromContext(ctx),
Repo: repoFromContext(ctx), Repo: repoFromContext(ctx),
Commit: commitFromContext(ctx), Commit: commitFromContext(ctx),