Skip to content

Commit b3f1ccc

Browse files
authored
Refactor to remove unnecessary error in the return values (#5617)
Signed-off-by: Yoshiki Fujikane <[email protected]>
1 parent ce438ce commit b3f1ccc

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

pkg/app/pipedv1/plugin/kubernetes/deployment/determine.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func parseContainerImage(image string) (img containerImage) {
4747

4848
// determineVersions decides artifact versions of an application.
4949
// It finds all container images that are being specified in the workload manifests then returns their names and tags.
50-
func determineVersions(manifests []provider.Manifest) ([]*model.ArtifactVersion, error) {
50+
func determineVersions(manifests []provider.Manifest) []*model.ArtifactVersion {
5151
imageMap := map[string]struct{}{}
5252
for _, m := range manifests {
5353
for _, c := range provider.FindContainerImages(m) {
@@ -66,7 +66,7 @@ func determineVersions(manifests []provider.Manifest) ([]*model.ArtifactVersion,
6666
})
6767
}
6868

69-
return versions, nil
69+
return versions
7070
}
7171

7272
// findManifests returns the manifests that have the specified kind and name.

pkg/app/pipedv1/plugin/kubernetes/deployment/determine_test.go

+6-11
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,12 @@ func TestParseContainerImage(t *testing.T) {
100100
}
101101
}
102102
func TestDetermineVersions(t *testing.T) {
103+
t.Parallel()
104+
103105
tests := []struct {
104106
name string
105107
manifests []string
106108
want []*model.ArtifactVersion
107-
wantErr bool
108109
}{
109110
{
110111
name: "single manifest with one container",
@@ -247,8 +248,7 @@ spec:
247248
spec: {}
248249
`,
249250
},
250-
want: []*model.ArtifactVersion{},
251-
wantErr: false,
251+
want: []*model.ArtifactVersion{},
252252
},
253253
{
254254
name: "manifest with invalid containers field -- skipped",
@@ -265,23 +265,18 @@ spec:
265265
- "invalid-containers-field"
266266
`,
267267
},
268-
wantErr: false,
269268
},
270269
}
271270

272271
for _, tt := range tests {
273272
t.Run(tt.name, func(t *testing.T) {
273+
t.Parallel()
274+
274275
var manifests []provider.Manifest
275276
for _, data := range tt.manifests {
276277
manifests = append(manifests, mustUnmarshalYAML[provider.Manifest](t, []byte(strings.TrimSpace(data))))
277278
}
278-
got, err := determineVersions(manifests)
279-
if tt.wantErr {
280-
require.Error(t, err)
281-
return
282-
} else {
283-
require.NoError(t, err)
284-
}
279+
got := determineVersions(manifests)
285280
assert.ElementsMatch(t, tt.want, got)
286281
})
287282
}

pkg/app/pipedv1/plugin/kubernetes/deployment/server.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,8 @@ func (a *DeploymentService) DetermineVersions(ctx context.Context, request *depl
145145
return nil, status.Error(codes.Internal, err.Error())
146146
}
147147

148-
versions, err := determineVersions(manifests)
149-
if err != nil {
150-
return nil, status.Error(codes.Internal, err.Error())
151-
}
152-
153148
return &deployment.DetermineVersionsResponse{
154-
Versions: versions,
149+
Versions: determineVersions(manifests),
155150
}, nil
156151
}
157152

0 commit comments

Comments
 (0)