Skip to content

Commit 60f511c

Browse files
committed
Resolve nilaway issues.
1 parent af719e5 commit 60f511c

2 files changed

Lines changed: 17 additions & 4 deletions

File tree

internal/tool.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ type Tools []Tool
146146

147147
// OnlyAvailable returns only tools that are available
148148
func (t *Tools) OnlyAvailable() (result Tools) {
149+
if t == nil {
150+
return
151+
}
152+
149153
for _, tool := range *t {
150154
if tool.IsAvailable() {
151155
result = append(result, tool)
@@ -158,6 +162,10 @@ func (t *Tools) OnlyAvailable() (result Tools) {
158162
func (t *Tools) FilterByTags(tags []string) (result Tools) {
159163
Assert(len(tags) > 0, "tags is empty")
160164

165+
if t == nil {
166+
return
167+
}
168+
161169
for _, tool := range *t {
162170
contains := true
163171

@@ -186,7 +194,7 @@ func (t *Tools) Get(id string) Tool {
186194

187195
// PrintTable prints tools list to the writer
188196
func (t *Tools) PrintTable(writer io.Writer) {
189-
if len(*t) == 0 {
197+
if t == nil || len(*t) == 0 {
190198
return
191199
}
192200

main.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,16 @@ var version = "dev"
1717
func parseEnvironment(environment string) (string, string) {
1818
parts := strings.SplitN(environment, ":", 2)
1919

20-
if len(parts) == 1 {
20+
switch len(parts) {
21+
case 0:
22+
return "", ""
23+
case 1:
2124
return parts[0], ""
25+
default:
26+
fallthrough
27+
case 2:
28+
return parts[0], parts[1]
2229
}
23-
24-
return parts[0], parts[1]
2530
}
2631

2732
func initEnvironment(directory string, environment *string, envProviders internal.EnvironmentProviders) (internal.Environment, error) {

0 commit comments

Comments
 (0)