Skip to content

refactor: refactor code and improve function signatures #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
appleboy merged 1 commit into from
Apr 1, 2023
Merged

refactor: refactor code and improve function signatures #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,10 @@ func getEnvironment(Environment []string) map[string]string {
return output
}

func (p Plugin) loadEnvironment(envs []string) (*lambda.Environment, error) {
m := aws.StringMap(getEnvironment(envs))
if p.Commit.Sha != "" {
m["DRONE_COMMIT"] = &p.Commit.Sha
}
if p.Commit.Author != "" {
m["DRONE_AUTHOR"] = &p.Commit.Author
}

func (p Plugin) loadEnvironment(envs []string) *lambda.Environment {
return &lambda.Environment{
Variables: m,
}, nil
Variables: aws.StringMap(getEnvironment(envs)),
}
}

// Exec executes the plugin.
Expand Down Expand Up @@ -204,13 +196,8 @@ func (p Plugin) Exec() error {

envs := trimValues(p.Config.Environment)
if len(envs) > 0 {
// load environment
env, err := p.loadEnvironment(envs)
if err != nil {
return err
}
isUpdateConfig = true
cfg.SetEnvironment(env)
cfg.SetEnvironment(p.loadEnvironment(envs))
}

subnets := trimValues(p.Config.Subnets)
Expand Down