Skip to content

Commit 854e157

Browse files
marceljkmarceljk
committed
add nil checks and wrap output of pointers with utils.PtrString()
1 parent 28f7db3 commit 854e157

File tree

175 files changed

+1029
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+1029
-546
lines changed

‎internal/cmd/beta/image/create/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ func outputResult(p *print.Printer, model *inputModel, resp *iaas.ImageCreateRes
395395

396396
return nil
397397
default:
398-
p.Outputf("Created image %q with id %s\n", model.Name, *model.Id)
398+
p.Outputf("Created image %q with id %s\n", model.Name, utils.PtrString(model.Id))
399399
return nil
400400
}
401401
}

‎internal/cmd/beta/key-pair/create/create.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,10 @@ func outputResult(p *print.Printer, model *inputModel, item *iaas.Keypair) error
156156
}
157157
p.Outputln(string(details))
158158
default:
159-
p.Outputf("Created key pair %q.\nkey pair Fingerprint: %q\n", *item.Name, *item.Fingerprint)
159+
p.Outputf("Created key pair %q.\nkey pair Fingerprint: %q\n",
160+
utils.PtrString(item.Name),
161+
utils.PtrString(item.Fingerprint),
162+
)
160163
}
161164
return nil
162165
}

‎internal/cmd/beta/key-pair/describe/describe.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7+
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
78
"strings"
89

910
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
@@ -145,7 +146,7 @@ func outputResult(p *print.Printer, outputFormat string, showOnlyPublicKey bool,
145146
return nil
146147
}
147148
table := tables.NewTable()
148-
table.AddRow("KEY PAIR NAME", *keyPair.Name)
149+
table.AddRow("KEY PAIR NAME", utils.PtrString(keyPair.Name))
149150
table.AddSeparator()
150151

151152
if *keyPair.Labels != nil && len(*keyPair.Labels) > 0 {
@@ -157,17 +158,17 @@ func outputResult(p *print.Printer, outputFormat string, showOnlyPublicKey bool,
157158
table.AddSeparator()
158159
}
159160

160-
table.AddRow("FINGERPRINT", *keyPair.Fingerprint)
161+
table.AddRow("FINGERPRINT", utils.PtrString(keyPair.Fingerprint))
161162
table.AddSeparator()
162163

163164
truncatedPublicKey := (*keyPair.PublicKey)[:maxLengthPublicKey] + "..."
164165
table.AddRow("PUBLIC KEY", truncatedPublicKey)
165166
table.AddSeparator()
166167

167-
table.AddRow("CREATED AT", *keyPair.CreatedAt)
168+
table.AddRow("CREATED AT", utils.PtrString(keyPair.CreatedAt))
168169
table.AddSeparator()
169170

170-
table.AddRow("UPDATED AT", *keyPair.UpdatedAt)
171+
table.AddRow("UPDATED AT", utils.PtrString(keyPair.UpdatedAt))
171172
table.AddSeparator()
172173

173174
p.Outputln(table.Render())

‎internal/cmd/beta/key-pair/list/list.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7+
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
78
"strings"
89

910
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
@@ -162,7 +163,13 @@ func outputResult(p *print.Printer, outputFormat string, keyPairs []iaas.Keypair
162163
labels = append(labels, fmt.Sprintf("%s: %s", key, value))
163164
}
164165

165-
table.AddRow(*keyPair.Name, strings.Join(labels, ", "), *keyPair.Fingerprint, *keyPair.CreatedAt, *keyPair.UpdatedAt)
166+
table.AddRow(
167+
utils.PtrString(keyPair.Name),
168+
strings.Join(labels, ", "),
169+
utils.PtrString(keyPair.Fingerprint),
170+
utils.PtrString(keyPair.CreatedAt),
171+
utils.PtrString(keyPair.UpdatedAt),
172+
)
166173
}
167174

168175
p.Outputln(table.Render())

‎internal/cmd/beta/key-pair/update/update.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func outputResult(p *print.Printer, model *inputModel, keyPair *iaas.Keypair) er
137137
}
138138
p.Outputln(string(details))
139139
default:
140-
p.Outputf("Updated labels of key pair %q\n", *model.KeyPairName)
140+
p.Outputf("Updated labels of key pair %q\n", utils.PtrString(model.KeyPairName))
141141
}
142142
return nil
143143
}

‎internal/cmd/beta/network-area/create/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func outputResult(p *print.Printer, model *inputModel, orgLabel string, networkA
197197

198198
return nil
199199
default:
200-
p.Outputf("Created STACKIT Network Area for organization %q.\nNetwork area ID: %s\n", orgLabel, *networkArea.AreaId)
200+
p.Outputf("Created STACKIT Network Area for organization %q.\nNetwork area ID: %s\n", orgLabel, utils.PtrString(networkArea.AreaId))
201201
return nil
202202
}
203203
}

‎internal/cmd/beta/network-area/describe/describe.go‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ func outputResult(p *print.Printer, outputFormat string, networkArea *iaas.Netwo
160160
}
161161

162162
table := tables.NewTable()
163-
table.AddRow("ID", *networkArea.AreaId)
163+
table.AddRow("ID", utils.PtrString(networkArea.AreaId))
164164
table.AddSeparator()
165-
table.AddRow("NAME", *networkArea.Name)
165+
table.AddRow("NAME", utils.PtrString(networkArea.Name))
166166
table.AddSeparator()
167-
table.AddRow("STATE", *networkArea.State)
167+
table.AddRow("STATE", utils.PtrString(networkArea.State))
168168
table.AddSeparator()
169169
if len(networkRanges) > 0 {
170170
table.AddRow("NETWORK RANGES", strings.Join(networkRanges, ","))
@@ -174,31 +174,33 @@ func outputResult(p *print.Printer, outputFormat string, networkArea *iaas.Netwo
174174
table.AddRow(fmt.Sprintf("STATIC ROUTE %d", i+1), route)
175175
table.AddSeparator()
176176
}
177-
if networkArea.Ipv4.TransferNetwork != nil {
178-
table.AddRow("TRANSFER RANGE", *networkArea.Ipv4.TransferNetwork)
179-
table.AddSeparator()
180-
}
181-
if networkArea.Ipv4.DefaultNameservers != nil {
182-
table.AddRow("DNS NAME SERVERS", strings.Join(*networkArea.Ipv4.DefaultNameservers, ","))
183-
table.AddSeparator()
184-
}
185-
if networkArea.Ipv4.DefaultPrefixLen != nil {
186-
table.AddRow("DEFAULT PREFIX LENGTH", *networkArea.Ipv4.DefaultPrefixLen)
187-
table.AddSeparator()
188-
}
189-
if networkArea.Ipv4.MaxPrefixLen != nil {
190-
table.AddRow("MAX PREFIX LENGTH", *networkArea.Ipv4.MaxPrefixLen)
191-
table.AddSeparator()
192-
}
193-
if networkArea.Ipv4.MinPrefixLen != nil {
194-
table.AddRow("MIN PREFIX LENGTH", *networkArea.Ipv4.MinPrefixLen)
195-
table.AddSeparator()
177+
if networkArea.Ipv4 != nil {
178+
if networkArea.Ipv4.TransferNetwork != nil {
179+
table.AddRow("TRANSFER RANGE", *networkArea.Ipv4.TransferNetwork)
180+
table.AddSeparator()
181+
}
182+
if networkArea.Ipv4.DefaultNameservers != nil && len(*networkArea.Ipv4.DefaultNameservers) > 0 {
183+
table.AddRow("DNS NAME SERVERS", strings.Join(*networkArea.Ipv4.DefaultNameservers, ","))
184+
table.AddSeparator()
185+
}
186+
if networkArea.Ipv4.DefaultPrefixLen != nil {
187+
table.AddRow("DEFAULT PREFIX LENGTH", *networkArea.Ipv4.DefaultPrefixLen)
188+
table.AddSeparator()
189+
}
190+
if networkArea.Ipv4.MaxPrefixLen != nil {
191+
table.AddRow("MAX PREFIX LENGTH", *networkArea.Ipv4.MaxPrefixLen)
192+
table.AddSeparator()
193+
}
194+
if networkArea.Ipv4.MinPrefixLen != nil {
195+
table.AddRow("MIN PREFIX LENGTH", *networkArea.Ipv4.MinPrefixLen)
196+
table.AddSeparator()
197+
}
196198
}
197199
if len(attachedProjects) > 0 {
198200
table.AddRow("ATTACHED PROJECTS IDS", strings.Join(attachedProjects, "\n"))
199201
table.AddSeparator()
200202
} else {
201-
table.AddRow("# ATTACHED PROJECTS", *networkArea.ProjectCount)
203+
table.AddRow("# ATTACHED PROJECTS", utils.PtrString(networkArea.ProjectCount))
202204
table.AddSeparator()
203205
}
204206

‎internal/cmd/beta/network-area/list/list.go‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7+
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
78

89
"github.com/goccy/go-yaml"
910
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
@@ -164,7 +165,20 @@ func outputResult(p *print.Printer, outputFormat string, networkAreas []iaas.Net
164165
table.SetHeader("ID", "Name", "Status", "Network Ranges", "# Attached Projects")
165166

166167
for _, networkArea := range networkAreas {
167-
table.AddRow(*networkArea.AreaId, *networkArea.Name, *networkArea.State, len(*networkArea.Ipv4.NetworkRanges), *networkArea.ProjectCount)
168+
networkRanges := "n/a"
169+
if ipv4 := networkArea.Ipv4; ipv4 != nil {
170+
if netRange := ipv4.NetworkRanges; netRange != nil {
171+
networkRanges = fmt.Sprint(len(*netRange))
172+
}
173+
}
174+
175+
table.AddRow(
176+
utils.PtrString(networkArea.AreaId),
177+
utils.PtrString(networkArea.Name),
178+
utils.PtrString(networkArea.State),
179+
networkRanges,
180+
utils.PtrString(networkArea.ProjectCount),
181+
)
168182
table.AddSeparator()
169183
}
170184

‎internal/cmd/beta/network-area/network-range/create/create.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import (
1212
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/client"
15-
"github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/utils"
15+
iaasUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/utils"
16+
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1617
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1718

1819
"github.com/spf13/cobra"
@@ -57,7 +58,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
5758
}
5859

5960
// Get network area label
60-
networkAreaLabel, err := utils.GetNetworkAreaName(ctx, apiClient, *model.OrganizationId, *model.NetworkAreaId)
61+
networkAreaLabel, err := iaasUtils.GetNetworkAreaName(ctx, apiClient, *model.OrganizationId, *model.NetworkAreaId)
6162
if err != nil {
6263
p.Debug(print.ErrorLevel, "get network area name: %v", err)
6364
networkAreaLabel = *model.NetworkAreaId
@@ -82,7 +83,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
8283
return fmt.Errorf("empty response from API")
8384
}
8485

85-
networkRange, err := utils.GetNetworkRangeFromAPIResponse(*model.NetworkRange, resp.Items)
86+
networkRange, err := iaasUtils.GetNetworkRangeFromAPIResponse(*model.NetworkRange, resp.Items)
8687
if err != nil {
8788
return err
8889
}
@@ -156,7 +157,7 @@ func outputResult(p *print.Printer, model *inputModel, networkAreaLabel string,
156157

157158
return nil
158159
default:
159-
p.Outputf("Created network range for SNA %q.\nNetwork range ID: %s\n", networkAreaLabel, *networkRange.NetworkRangeId)
160+
p.Outputf("Created network range for SNA %q.\nNetwork range ID: %s\n", networkAreaLabel, utils.PtrString(networkRange.NetworkRangeId))
160161
return nil
161162
}
162163
}

‎internal/cmd/beta/network-area/network-range/describe/describe.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ func outputResult(p *print.Printer, outputFormat string, networkRange *iaas.Netw
128128
return nil
129129
default:
130130
table := tables.NewTable()
131-
table.AddRow("ID", *networkRange.NetworkRangeId)
131+
table.AddRow("ID", utils.PtrString(networkRange.NetworkRangeId))
132132
table.AddSeparator()
133-
table.AddRow("Network range", *networkRange.Prefix)
133+
table.AddRow("Network range", utils.PtrString(networkRange.Prefix))
134134

135135
err := table.Display(p)
136136
if err != nil {

0 commit comments

Comments
 (0)