Skip to content

Commit ebbfe43

Browse files
authored
Merge pull request #186 from mittwald/fix/return-artifact-with-labels
always return labels when listing artifacts
2 parents 17f5762 + 2c2d827 commit ebbfe43

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

apiv2/pkg/clients/artifact/artifact.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package artifact
33
import (
44
"context"
55
"fmt"
6-
76
"github.com/go-openapi/runtime"
87
v2client "github.com/mittwald/goharbor-client/v5/apiv2/internal/api/client"
98
"github.com/mittwald/goharbor-client/v5/apiv2/internal/api/client/artifact"
109
"github.com/mittwald/goharbor-client/v5/apiv2/model"
1110
"github.com/mittwald/goharbor-client/v5/apiv2/pkg/config"
11+
"github.com/mittwald/goharbor-client/v5/apiv2/pkg/util"
1212
)
1313

1414
// RESTClient is a subclient for handling artifact related actions.
@@ -164,6 +164,7 @@ func (c *RESTClient) GetArtifact(ctx context.Context, projectName, repositoryNam
164164
params.WithRepositoryName(repositoryName)
165165
params.WithReference(reference)
166166
params.WithContext(ctx)
167+
params.WithWithLabel(util.BoolPtr(true))
167168

168169
resp, err := c.V2Client.Artifact.GetArtifact(params, c.AuthInfo)
169170
if err != nil {
@@ -202,6 +203,7 @@ func (c *RESTClient) ListArtifacts(ctx context.Context, projectName, repositoryN
202203
params.Sort = &c.Options.Sort
203204
params.WithProjectName(projectName)
204205
params.WithRepositoryName(repositoryName)
206+
params.WithWithLabel(util.BoolPtr(true))
205207

206208
for {
207209
resp, err := c.V2Client.Artifact.ListArtifacts(params, c.AuthInfo)

apiv2/pkg/clients/artifact/artifact_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package artifact
44

55
import (
66
"context"
7+
"github.com/mittwald/goharbor-client/v5/apiv2/pkg/util"
78
"testing"
89

910
"github.com/mittwald/goharbor-client/v5/apiv2/internal/api/client/artifact"
@@ -223,6 +224,7 @@ func TestRESTClient_GetArtifact(t *testing.T) {
223224
getParams.WithRepositoryName(repositoryName)
224225
getParams.WithReference(reference)
225226
getParams.WithContext(ctx)
227+
getParams.WithWithLabel(util.BoolPtr(true))
226228

227229
getParams.WithTimeout(apiClient.Options.Timeout)
228230

@@ -248,6 +250,7 @@ func TestRESTClient_ListArtifacts(t *testing.T) {
248250
listParams.WithSort(&apiClient.Options.Sort)
249251
listParams.WithQ(&apiClient.Options.Query)
250252
listParams.WithTimeout(apiClient.Options.Timeout)
253+
listParams.WithWithLabel(util.BoolPtr(true))
251254

252255
mockClient.Artifact.On("ListArtifacts", listParams, mock.AnythingOfType("runtime.ClientAuthInfoWriterFunc")).
253256
Return(&artifact.ListArtifactsOK{Payload: []*model.Artifact{}}, nil)

apiv2/pkg/util/pointer.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ func Int64Ptr(in int64) *int64 {
77
func StringPtr(in string) *string {
88
return &in
99
}
10+
11+
func BoolPtr(in bool) *bool {
12+
return &in
13+
}

0 commit comments

Comments
 (0)