Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:

- name: Run linters
run: |
echo 'eirctl run vuln:check'
eirctl run lints

- name: Unit Tests
run: |
Expand Down
31 changes: 31 additions & 0 deletions .golangci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: "2"
linters:
# Default set of linters.
# The value can be: `standard`, `all`, `none`, or `fast`.
# Default: standard
default: standard
exclusions:
generated: lax
# Log a warning if an exclusion rule is unused.
# Default: false
warn-unused: true
# Predefined exclusion rules.
# Default: []
presets:
- comments
- std-error-handling
- common-false-positives
- legacy
# Excluding configuration per-path, per-linter, per-text and per-source.
rules:
# Exclude some linters from running on tests files.
- path: _test\.go
linters:
- gocyclo
- errcheck
- dupl
- gosec
- ineffassign
- staticcheck
- unused
- govet
69 changes: 0 additions & 69 deletions Makefile

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/saml.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func newSamlCmd(r *Root) {
return err
}

allRoles := credentialexchange.MergeRoleChain(flags.role, r.rootFlags.roleChain, sc.flags.isSso)
allRoles := credentialexchange.MergeRoleChain(flags.role, r.rootFlags.roleChain, flags.isSso)
conf := credentialexchange.CredentialConfig{
ProviderUrl: flags.providerUrl,
PrincipalArn: flags.principalArn,
Expand Down
2 changes: 1 addition & 1 deletion eirctl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ tasks:
- |
mkdir -p .deps
ldflags="-s -w -X \"github.com/{{.RepoOwner}}/{{.BinName}}/cmd.Version={{.Version}}\" -X \"github.com/{{.RepoOwner}}/{{.BinName}}/cmd.Revision={{.Revision}}\" -extldflags -static"
CGO_ENABLED=0 GOPATH=$PWD/.deps GOOS=${BUILD_GOOS} GOARCH=${BUILD_GOARCH} go build -mod=readonly -buildvcs=false -ldflags="$ldflags" -o dist/{{.BinName}}-${BUILD_GOOS}${BUILD_GOARCH} .
CGO_ENABLED=0 GOPATH=$PWD/.deps GOOS=${BUILD_GOOS} GOARCH=${BUILD_GOARCH} go build -mod=readonly -buildvcs=false -ldflags="$ldflags" -o dist/{{.BinName}}-${BUILD_GOOS}-${BUILD_GOARCH} .
variations:
- BUILD_GOOS: windows
BUILD_GOARCH: amd64
Expand Down
5 changes: 3 additions & 2 deletions internal/web/web.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ func (web *Web) MustClose() {
utils.Sleep(0.5)
// remove process just in case
// os.Process is cross platform safe way to remove a process
osprocess := os.Process{Pid: web.launcher.PID()}
_ = osprocess.Kill()
if osprocess, err := os.FindProcess(web.launcher.PID()); err == nil && osprocess != nil {
_ = osprocess.Kill()
}
}
Loading