Skip to content

Commit 1548bad

Browse files
cgoetz-inovexcgoetz-inovex
committed
list commands
1 parent 739c9f7 commit 1548bad

55 files changed

Lines changed: 225 additions & 256 deletions

File tree

Some content is hidden

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

‎internal/cmd/affinity-groups/list/list.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func configureFlags(cmd *cobra.Command) {
8888
}
8989

9090
func buildRequest(ctx context.Context, model inputModel, apiClient *iaas.APIClient) iaas.ApiListAffinityGroupsRequest {
91-
return apiClient.ListAffinityGroups(ctx, model.ProjectId, model.Region)
91+
return apiClient.DefaultAPI.ListAffinityGroups(ctx, model.ProjectId, model.Region)
9292
}
9393

9494
func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
@@ -125,8 +125,8 @@ func outputResult(p *print.Printer, outputFormat, projectLabel string, items []i
125125
for _, item := range items {
126126
table.AddRow(
127127
utils.PtrString(item.Id),
128-
utils.PtrString(item.Name),
129-
utils.PtrString(item.Policy),
128+
item.Name,
129+
item.Policy,
130130
)
131131
table.AddSeparator()
132132
}

‎internal/cmd/affinity-groups/list/list_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5656
}
5757

5858
func fixtureRequest(mods ...func(request *iaas.ApiListAffinityGroupsRequest)) iaas.ApiListAffinityGroupsRequest {
59-
request := testClient.ListAffinityGroups(testCtx, testProjectId, testRegion)
59+
request := testClient.DefaultAPI.ListAffinityGroups(testCtx, testProjectId, testRegion)
6060
for _, mod := range mods {
6161
mod(&request)
6262
}
@@ -132,7 +132,7 @@ func TestBuildRequest(t *testing.T) {
132132
request := buildRequest(testCtx, tt.model, testClient)
133133
diff := cmp.Diff(request, tt.expectedRequest,
134134
cmp.AllowUnexported(tt.expectedRequest),
135-
cmpopts.EquateComparable(testCtx))
135+
cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}))
136136
if diff != "" {
137137
t.Fatalf("Request does not match: %s", diff)
138138
}

‎internal/cmd/image/list/list.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
135135
}
136136

137137
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiListImagesRequest {
138-
request := apiClient.ListImages(ctx, model.ProjectId, model.Region)
138+
request := apiClient.DefaultAPI.ListImages(ctx, model.ProjectId, model.Region)
139139
if model.LabelSelector != nil {
140140
request = request.LabelSelector(*model.LabelSelector)
141141
}
@@ -171,10 +171,10 @@ func outputResult(p *print.Printer, outputFormat, projectLabel string, items []i
171171
if v := cfg.OperatingSystem; v != nil {
172172
os = *v
173173
}
174-
if v := cfg.OperatingSystemDistro; v != nil && v.IsSet() {
174+
if v := cfg.OperatingSystemDistro; v.IsSet() {
175175
distro = *v.Get()
176176
}
177-
if v := cfg.OperatingSystemVersion; v != nil && v.IsSet() {
177+
if v := cfg.OperatingSystemVersion; v.IsSet() {
178178
version = *v.Get()
179179
}
180180
}
@@ -186,14 +186,14 @@ func outputResult(p *print.Printer, outputFormat, projectLabel string, items []i
186186
}
187187

188188
table.AddRow(utils.PtrString(item.Id),
189-
utils.PtrString(item.Name),
189+
item.Name,
190190
os,
191191
architecture,
192192
distro,
193193
version,
194194
scope,
195195
owner,
196-
utils.JoinStringKeysPtr(*item.Labels, ","))
196+
utils.JoinStringKeysPtr(item.Labels, ","))
197197
}
198198
err := table.Display(p)
199199
if err != nil {

‎internal/cmd/image/list/list_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6262
}
6363

6464
func fixtureRequest(mods ...func(request *iaas.ApiListImagesRequest)) iaas.ApiListImagesRequest {
65-
request := testClient.ListImages(testCtx, testProjectId, testRegion)
65+
request := testClient.DefaultAPI.ListImages(testCtx, testProjectId, testRegion)
6666
request = request.LabelSelector(testLabels)
6767
for _, mod := range mods {
6868
mod(&request)
@@ -176,7 +176,7 @@ func TestBuildRequest(t *testing.T) {
176176
request := buildRequest(testCtx, tt.model, testClient)
177177
diff := cmp.Diff(request, tt.expectedRequest,
178178
cmp.AllowUnexported(tt.expectedRequest),
179-
cmpopts.EquateComparable(testCtx),
179+
cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}),
180180
)
181181
if diff != "" {
182182
t.Fatalf("Data does not match: %s", diff)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
118118
}
119119

120120
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiListKeyPairsRequest {
121-
req := apiClient.ListKeyPairs(ctx)
121+
req := apiClient.DefaultAPI.ListKeyPairs(ctx)
122122
if model.LabelSelector != nil {
123123
req = req.LabelSelector(*model.LabelSelector)
124124
}
@@ -140,7 +140,7 @@ func outputResult(p *print.Printer, outputFormat string, keyPairs []iaas.Keypair
140140

141141
var labels []string
142142
if keyPair.Labels != nil {
143-
for key, value := range *keyPair.Labels {
143+
for key, value := range keyPair.Labels {
144144
labels = append(labels, fmt.Sprintf("%s: %s", key, value))
145145
}
146146
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func fixtureInputModel(mods ...func(inputModel *inputModel)) *inputModel {
4848
}
4949

5050
func fixtureRequest(mods ...func(request *iaas.ApiListKeyPairsRequest)) iaas.ApiListKeyPairsRequest {
51-
request := testClient.ListKeyPairs(testCtx)
51+
request := testClient.DefaultAPI.ListKeyPairs(testCtx)
5252
request = request.LabelSelector(testLabelSelector)
5353
for _, mod := range mods {
5454
mod(&request)
@@ -141,7 +141,7 @@ func TestBuildRequest(t *testing.T) {
141141

142142
diff := cmp.Diff(request, tt.expectedRequest,
143143
cmp.AllowUnexported(tt.expectedRequest),
144-
cmpopts.EquateComparable(testCtx),
144+
cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}),
145145
)
146146
if diff != "" {
147147
t.Fatalf("request does not match: %s", diff)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
141141
}
142142

143143
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiListNetworkAreasRequest {
144-
req := apiClient.ListNetworkAreas(ctx, model.OrganizationId)
144+
req := apiClient.DefaultAPI.ListNetworkAreas(ctx, model.OrganizationId)
145145
if model.LabelSelector != nil {
146146
req = req.LabelSelector(*model.LabelSelector)
147147
}
@@ -161,7 +161,7 @@ func outputResult(p *print.Printer, outputFormat, orgLabel string, networkAreas
161161
for _, networkArea := range networkAreas {
162162
table.AddRow(
163163
utils.PtrString(networkArea.Id),
164-
utils.PtrString(networkArea.Name),
164+
networkArea.Name,
165165
utils.PtrString(networkArea.ProjectCount),
166166
)
167167
table.AddSeparator()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5050
}
5151

5252
func fixtureRequest(mods ...func(request *iaas.ApiListNetworkAreasRequest)) iaas.ApiListNetworkAreasRequest {
53-
request := testClient.ListNetworkAreas(testCtx, testOrganizationId)
53+
request := testClient.DefaultAPI.ListNetworkAreas(testCtx, testOrganizationId)
5454
request = request.LabelSelector(testLabelSelector)
5555
for _, mod := range mods {
5656
mod(&request)
@@ -155,7 +155,7 @@ func TestBuildRequest(t *testing.T) {
155155

156156
diff := cmp.Diff(request, tt.expectedRequest,
157157
cmp.AllowUnexported(tt.expectedRequest),
158-
cmpopts.EquateComparable(testCtx),
158+
cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}),
159159
)
160160
if diff != "" {
161161
t.Fatalf("Data does not match: %s", diff)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
7777

7878
items := resp.GetItems()
7979

80-
networkAreaLabel, err := iaasUtils.GetNetworkAreaName(ctx, apiClient, model.OrganizationId, model.NetworkAreaId)
80+
networkAreaLabel, err := iaasUtils.GetNetworkAreaName(ctx, apiClient.DefaultAPI, model.OrganizationId, model.NetworkAreaId)
8181
if err != nil {
8282
params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
8383
networkAreaLabel = model.NetworkAreaId
@@ -126,7 +126,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
126126
}
127127

128128
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiListNetworkAreaRangesRequest {
129-
return apiClient.ListNetworkAreaRanges(ctx, model.OrganizationId, model.NetworkAreaId, model.Region)
129+
return apiClient.DefaultAPI.ListNetworkAreaRanges(ctx, model.OrganizationId, model.NetworkAreaId, model.Region)
130130
}
131131

132132
func outputResult(p *print.Printer, outputFormat, networkAreaLabel string, networkRanges []iaas.NetworkRange) error {
@@ -139,7 +139,7 @@ func outputResult(p *print.Printer, outputFormat, networkAreaLabel string, netwo
139139
table.SetHeader("ID", "Network Range")
140140

141141
for _, networkRange := range networkRanges {
142-
table.AddRow(utils.PtrString(networkRange.Id), utils.PtrString(networkRange.Prefix))
142+
table.AddRow(utils.PtrString(networkRange.Id), networkRange.Prefix)
143143
}
144144

145145
p.Outputln(table.Render())

‎internal/cmd/network-area/network-range/list/list_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5757
}
5858

5959
func fixtureRequest(mods ...func(request *iaas.ApiListNetworkAreaRangesRequest)) iaas.ApiListNetworkAreaRangesRequest {
60-
request := testClient.ListNetworkAreaRanges(testCtx, testOrganizationId, testNetworkAreaId, testRegion)
60+
request := testClient.DefaultAPI.ListNetworkAreaRanges(testCtx, testOrganizationId, testNetworkAreaId, testRegion)
6161
for _, mod := range mods {
6262
mod(&request)
6363
}
@@ -172,7 +172,7 @@ func TestBuildRequest(t *testing.T) {
172172

173173
diff := cmp.Diff(request, tt.expectedRequest,
174174
cmp.AllowUnexported(tt.expectedRequest),
175-
cmpopts.EquateComparable(testCtx),
175+
cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}),
176176
)
177177
if diff != "" {
178178
t.Fatalf("Data does not match: %s", diff)

0 commit comments

Comments
 (0)