Skip to content

Commit 4e8b576

Browse files
authored
Support multi user profile build-info collection (#335)
1 parent 9bbbed5 commit 4e8b576

File tree

5 files changed

+29
-49
lines changed

5 files changed

+29
-49
lines changed

artifactory/commands/conan/artifacts_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ func TestBuildArtifactQuery(t *testing.T) {
149149
}
150150
}
151151

152-
153152
func TestBuildPropertySetter_FormatBuildProperties(t *testing.T) {
154153
tests := []struct {
155154
name string
@@ -192,9 +191,9 @@ func TestBuildPropertySetter_FormatBuildProperties(t *testing.T) {
192191

193192
func TestNewArtifactCollector(t *testing.T) {
194193
targetRepo := "conan-local"
195-
194+
196195
collector := NewArtifactCollector(nil, targetRepo)
197-
196+
198197
assert.NotNil(t, collector)
199198
assert.Equal(t, targetRepo, collector.targetRepo)
200199
assert.Nil(t, collector.serverDetails)
@@ -205,16 +204,12 @@ func TestNewBuildPropertySetter(t *testing.T) {
205204
buildNumber := "1"
206205
projectKey := "test-project"
207206
targetRepo := "conan-local"
208-
207+
209208
setter := NewBuildPropertySetter(nil, targetRepo, buildName, buildNumber, projectKey)
210-
209+
211210
assert.NotNil(t, setter)
212211
assert.Equal(t, buildName, setter.buildName)
213212
assert.Equal(t, buildNumber, setter.buildNumber)
214213
assert.Equal(t, projectKey, setter.projectKey)
215214
assert.Equal(t, targetRepo, setter.targetRepo)
216215
}
217-
218-
219-
220-

artifactory/commands/conan/command_test.go

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
func TestNewConanCommand(t *testing.T) {
1111
cmd := NewConanCommand()
12-
12+
1313
assert.NotNil(t, cmd)
1414
assert.Empty(t, cmd.commandName)
1515
assert.Nil(t, cmd.args)
@@ -19,19 +19,19 @@ func TestNewConanCommand(t *testing.T) {
1919

2020
func TestConanCommand_SetCommandName(t *testing.T) {
2121
cmd := NewConanCommand()
22-
22+
2323
result := cmd.SetCommandName("install")
24-
24+
2525
assert.Equal(t, "install", cmd.commandName)
2626
assert.Same(t, cmd, result, "SetCommandName should return same instance for chaining")
2727
}
2828

2929
func TestConanCommand_SetArgs(t *testing.T) {
3030
cmd := NewConanCommand()
3131
args := []string{".", "--build=missing"}
32-
32+
3333
result := cmd.SetArgs(args)
34-
34+
3535
assert.Equal(t, args, cmd.args)
3636
assert.Same(t, cmd, result, "SetArgs should return same instance for chaining")
3737
}
@@ -41,18 +41,18 @@ func TestConanCommand_SetServerDetails(t *testing.T) {
4141
serverDetails := &config.ServerDetails{
4242
ServerId: "test-server",
4343
}
44-
44+
4545
result := cmd.SetServerDetails(serverDetails)
46-
46+
4747
assert.Equal(t, serverDetails, cmd.serverDetails)
4848
assert.Same(t, cmd, result, "SetServerDetails should return same instance for chaining")
4949
}
5050

5151
func TestConanCommand_CommandName(t *testing.T) {
5252
cmd := NewConanCommand()
53-
53+
5454
result := cmd.CommandName()
55-
55+
5656
assert.Equal(t, "rt_conan", result)
5757
}
5858

@@ -62,9 +62,9 @@ func TestConanCommand_ServerDetails(t *testing.T) {
6262
ServerId: "test-server",
6363
}
6464
cmd.serverDetails = serverDetails
65-
65+
6666
result, err := cmd.ServerDetails()
67-
67+
6868
assert.NoError(t, err)
6969
assert.Equal(t, serverDetails, result)
7070
}
@@ -73,9 +73,9 @@ func TestConanCommand_GetCmd(t *testing.T) {
7373
cmd := NewConanCommand()
7474
cmd.commandName = "install"
7575
cmd.args = []string{".", "--build=missing"}
76-
76+
7777
execCmd := cmd.GetCmd()
78-
78+
7979
assert.NotNil(t, execCmd)
8080
assert.Equal(t, "conan", execCmd.Path[len(execCmd.Path)-5:]) // ends with "conan"
8181
assert.Contains(t, execCmd.Args, "install")
@@ -85,43 +85,38 @@ func TestConanCommand_GetCmd(t *testing.T) {
8585

8686
func TestConanCommand_GetEnv(t *testing.T) {
8787
cmd := NewConanCommand()
88-
88+
8989
env := cmd.GetEnv()
90-
90+
9191
assert.NotNil(t, env)
9292
assert.Empty(t, env)
9393
}
9494

9595
func TestConanCommand_GetStdWriter(t *testing.T) {
9696
cmd := NewConanCommand()
97-
97+
9898
writer := cmd.GetStdWriter()
99-
99+
100100
assert.Nil(t, writer)
101101
}
102102

103103
func TestConanCommand_GetErrWriter(t *testing.T) {
104104
cmd := NewConanCommand()
105-
105+
106106
writer := cmd.GetErrWriter()
107-
107+
108108
assert.Nil(t, writer)
109109
}
110110

111111
func TestConanCommand_ChainedSetters(t *testing.T) {
112112
serverDetails := &config.ServerDetails{ServerId: "test"}
113-
113+
114114
cmd := NewConanCommand().
115115
SetCommandName("upload").
116116
SetArgs([]string{"pkg/1.0", "-r", "remote"}).
117117
SetServerDetails(serverDetails)
118-
118+
119119
assert.Equal(t, "upload", cmd.commandName)
120120
assert.Equal(t, []string{"pkg/1.0", "-r", "remote"}, cmd.args)
121121
assert.Equal(t, serverDetails, cmd.serverDetails)
122122
}
123-
124-
125-
126-
127-

artifactory/commands/conan/login_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,3 @@ func TestFormatServerIDs(t *testing.T) {
299299
})
300300
}
301301
}
302-
303-
304-
305-

artifactory/commands/conan/upload_test.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,19 +114,13 @@ Upload completed in 3s
114114
}
115115
}
116116

117-
118117
func TestNewUploadProcessor(t *testing.T) {
119118
workingDir := "/test/path"
120-
119+
121120
processor := NewUploadProcessor(workingDir, nil, nil)
122-
121+
123122
assert.NotNil(t, processor)
124123
assert.Equal(t, workingDir, processor.workingDir)
125124
assert.Nil(t, processor.buildConfiguration)
126125
assert.Nil(t, processor.serverDetails)
127126
}
128-
129-
130-
131-
132-

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ require (
77
github.com/forPelevin/gomoji v1.4.1
88
github.com/google/go-containerregistry v0.20.7
99
github.com/jedib0t/go-pretty/v6 v6.7.5
10-
github.com/jfrog/build-info-go v1.13.1-0.20260106060835-a1a07c967546
10+
github.com/jfrog/build-info-go v1.13.1-0.20260106203543-03b99793ca5a
1111
github.com/jfrog/gofrog v1.7.6
12-
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251
12+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b
1313
github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23
1414
github.com/pkg/errors v0.9.1
1515
github.com/spf13/viper v1.21.0

0 commit comments

Comments
 (0)