Skip to content

Commit d3d0f6c

Browse files
author
Paola Nicosia
committed
fix: lint problems
1 parent 5c11e3a commit d3d0f6c

File tree

6 files changed

+74
-64
lines changed

6 files changed

+74
-64
lines changed

‎internal/cmd/marketplace/apply/apply_test.go‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"net/http"
2525
"net/http/httptest"
2626
"os"
27-
"strings"
2827
"testing"
2928

3029
"github.com/mia-platform/miactl/internal/client"
@@ -36,7 +35,6 @@ import (
3635
)
3736

3837
func TestApplyCommand(t *testing.T) {
39-
4038
t.Run("test post run - shows deprecated command message", func(t *testing.T) {
4139
storeStdout := os.Stdout
4240
r, w, _ := os.Pipe()
@@ -101,30 +99,33 @@ func TestApplyCommand(t *testing.T) {
10199
func ApplyItemCommandMockServer(t *testing.T, consoleVersionResponse string) http.HandlerFunc {
102100
t.Helper()
103101
return func(w http.ResponseWriter, r *http.Request) {
104-
if strings.EqualFold(r.URL.Path, "/api/backend/marketplace/tenants/company-id/resources") &&
105-
r.Method == http.MethodPost {
106-
mockResponse := &marketplace.ApplyResponse{
107-
Done: true,
108-
Items: []marketplace.ApplyResponseItem{
109-
{
110-
ID: "id1",
111-
ItemID: "some-item-id",
112-
Done: true,
113-
Inserted: true,
114-
Updated: false,
102+
switch r.URL.Path {
103+
case "/api/backend/marketplace/tenants/company-id/resources":
104+
if r.Method == http.MethodPost {
105+
mockResponse := &marketplace.ApplyResponse{
106+
Done: true,
107+
Items: []marketplace.ApplyResponseItem{
108+
{
109+
ID: "id1",
110+
ItemID: "some-item-id",
111+
Done: true,
112+
Inserted: true,
113+
Updated: false,
114+
},
115115
},
116-
},
117-
}
116+
}
118117

119-
w.WriteHeader(http.StatusOK)
120-
resBytes, err := json.Marshal(mockResponse)
121-
require.NoError(t, err)
122-
w.Write(resBytes)
123-
} else if strings.EqualFold(r.URL.Path, "/api/version") &&
124-
r.Method == http.MethodGet {
125-
_, err := w.Write([]byte(consoleVersionResponse))
126-
require.NoError(t, err)
127-
} else {
118+
w.WriteHeader(http.StatusOK)
119+
resBytes, err := json.Marshal(mockResponse)
120+
require.NoError(t, err)
121+
w.Write(resBytes)
122+
}
123+
case "/api/version":
124+
if r.Method == http.MethodGet {
125+
_, err := w.Write([]byte(consoleVersionResponse))
126+
require.NoError(t, err)
127+
}
128+
default:
128129
w.WriteHeader(http.StatusNotFound)
129130
assert.Fail(t, fmt.Sprintf("unexpected request: %s", r.URL.Path))
130131
}

‎internal/cmd/marketplace/delete_test.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"net/http"
2323
"net/http/httptest"
2424
"os"
25-
"strings"
2625
"testing"
2726

2827
"github.com/mia-platform/miactl/internal/client"
@@ -108,14 +107,17 @@ func TestDeleteResourceCmd(t *testing.T) {
108107
func deleteItemCommandMockServer(t *testing.T, consoleVersionResponse string) http.HandlerFunc {
109108
t.Helper()
110109
return func(w http.ResponseWriter, r *http.Request) {
111-
if strings.EqualFold(r.URL.Path, "/api/backend/marketplace/tenants/company-id/resources/some-item-id/versions/1.0.0") &&
112-
r.Method == http.MethodDelete {
113-
w.WriteHeader(http.StatusNoContent)
114-
} else if strings.EqualFold(r.URL.Path, "/api/version") &&
115-
r.Method == http.MethodGet {
116-
_, err := w.Write([]byte(consoleVersionResponse))
117-
require.NoError(t, err)
118-
} else {
110+
switch r.URL.Path {
111+
case "/api/backend/marketplace/tenants/company-id/resources/some-item-id/versions/1.0.0":
112+
if r.Method == http.MethodDelete {
113+
w.WriteHeader(http.StatusNoContent)
114+
}
115+
case "/api/version":
116+
if r.Method == http.MethodGet {
117+
_, err := w.Write([]byte(consoleVersionResponse))
118+
require.NoError(t, err)
119+
}
120+
default:
119121
w.WriteHeader(http.StatusNotFound)
120122
assert.Fail(t, fmt.Sprintf("unexpected request: %s", r.URL.Path))
121123
}

‎internal/cmd/marketplace/get_test.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"net/http"
2323
"net/http/httptest"
2424
"os"
25-
"strings"
2625
"testing"
2726

2827
"github.com/mia-platform/miactl/internal/client"
@@ -174,15 +173,18 @@ func getItemByIDMockServer(t *testing.T, validResponse bool, statusCode int) *ht
174173
func getItemCommandMockServer(t *testing.T, consoleVersionResponse string) http.HandlerFunc {
175174
t.Helper()
176175
return func(w http.ResponseWriter, r *http.Request) {
177-
if strings.EqualFold(r.URL.Path, "/api/backend/marketplace/tenants/some-company-id/resources/some-item-id/versions/1.0.0") &&
178-
r.Method == http.MethodGet {
179-
_, err := w.Write([]byte(validBodyJSONString))
180-
require.NoError(t, err)
181-
} else if strings.EqualFold(r.URL.Path, "/api/version") &&
182-
r.Method == http.MethodGet {
183-
_, err := w.Write([]byte(consoleVersionResponse))
184-
require.NoError(t, err)
185-
} else {
176+
switch r.URL.Path {
177+
case "/api/backend/marketplace/tenants/some-company-id/resources/some-item-id/versions/1.0.0":
178+
if r.Method == http.MethodGet {
179+
_, err := w.Write([]byte(validBodyJSONString))
180+
require.NoError(t, err)
181+
}
182+
case "/api/version":
183+
if r.Method == http.MethodGet {
184+
_, err := w.Write([]byte(consoleVersionResponse))
185+
require.NoError(t, err)
186+
}
187+
default:
186188
w.WriteHeader(http.StatusNotFound)
187189
assert.Fail(t, fmt.Sprintf("unexpected request: %s", r.URL.Path))
188190
}

‎internal/cmd/marketplace/list_test.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,18 @@ func TestBuildMarketplaceItemsList(t *testing.T) {
188188
func listCommandHandler(t *testing.T, consoleVersionResponse string) http.HandlerFunc {
189189
t.Helper()
190190
return func(w http.ResponseWriter, r *http.Request) {
191-
if strings.EqualFold(r.URL.Path, "/api/backend/marketplace/") &&
192-
r.Method == http.MethodGet &&
193-
r.URL.Query().Get("tenantId") == "my-company" {
194-
_, err := w.Write([]byte(marketplaceItemsBodyContent(t)))
195-
require.NoError(t, err)
196-
} else if strings.EqualFold(r.URL.Path, "/api/version") &&
197-
r.Method == http.MethodGet {
198-
_, err := w.Write([]byte(consoleVersionResponse))
199-
require.NoError(t, err)
200-
} else {
191+
switch r.URL.Path {
192+
case "/api/backend/marketplace/":
193+
if r.Method == http.MethodGet {
194+
_, err := w.Write([]byte(marketplaceItemsBodyContent(t)))
195+
require.NoError(t, err)
196+
}
197+
case "/api/version":
198+
if r.Method == http.MethodGet {
199+
_, err := w.Write([]byte(consoleVersionResponse))
200+
require.NoError(t, err)
201+
}
202+
default:
201203
w.WriteHeader(http.StatusNotFound)
202204
assert.Fail(t, fmt.Sprintf("unexpected request: %s", r.URL.Path))
203205
}

‎internal/cmd/marketplace/list_versions_test.go‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -277,15 +277,18 @@ func TestBuildMarketplaceItemVersionList(t *testing.T) {
277277
func listVersionsCommandHandler(t *testing.T, consoleVersionResponse string) http.HandlerFunc {
278278
t.Helper()
279279
return func(w http.ResponseWriter, r *http.Request) {
280-
if strings.EqualFold(r.URL.Path, "/api/backend/marketplace/tenants/my-company/resources/item-id/versions") &&
281-
r.Method == http.MethodGet {
282-
_, err := w.Write([]byte(listVersionsMockResponseBody))
283-
require.NoError(t, err)
284-
} else if strings.EqualFold(r.URL.Path, "/api/version") &&
285-
r.Method == http.MethodGet {
286-
_, err := w.Write([]byte(consoleVersionResponse))
287-
require.NoError(t, err)
288-
} else {
280+
switch r.URL.Path {
281+
case "/api/backend/marketplace/tenants/my-company/resources/item-id/versions":
282+
if r.Method == http.MethodGet {
283+
_, err := w.Write([]byte(listVersionsMockResponseBody))
284+
require.NoError(t, err)
285+
}
286+
case "/api/version":
287+
if r.Method == http.MethodGet {
288+
_, err := w.Write([]byte(consoleVersionResponse))
289+
require.NoError(t, err)
290+
}
291+
default:
289292
w.WriteHeader(http.StatusNotFound)
290293
assert.Fail(t, fmt.Sprintf("unexpected request: %s", r.URL.Path))
291294
}

‎internal/util/post_run.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func ShowDeprecatedMessage(opts *clioptions.CLIOptions) func(cmd *cobra.Command,
3131
client, err := client.APIClientForConfig(restConfig)
3232
cobra.CheckErr(err)
3333

34-
canUseNewApi, error := VersionCheck(cmd.Context(), client, 14, 0)
35-
if error == nil && canUseNewApi {
34+
canUseNewAPI, versionError := VersionCheck(cmd.Context(), client, 14, 0)
35+
if versionError == nil && canUseNewAPI {
3636
writer := cmd.ErrOrStderr()
3737
fmt.Fprint(writer, "\nThe command you are using is deprecated. Please use 'miactl catalog' instead.")
3838
}

0 commit comments

Comments
 (0)