Skip to content

Commit 3464b66

Browse files
AurifiAurifi
Aurifi
and
Aurifi
authored
fix: correctly perform requests for dt deployed on subpaths (#54)
Co-authored-by: Aurifi <[email protected]>
1 parent bd03e36 commit 3464b66

25 files changed

+125
-125
lines changed

‎about.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type AboutService struct {
2828
}
2929

3030
func (as AboutService) Get(ctx context.Context) (a About, err error) {
31-
req, err := as.client.newRequest(ctx, http.MethodGet, "/api/version", withoutAuth())
31+
req, err := as.client.newRequest(ctx, http.MethodGet, "api/version", withoutAuth())
3232
if err != nil {
3333
return
3434
}

‎acl.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type ACLMappingRequest struct {
1818
}
1919

2020
func (as ACLService) AddProjectMapping(ctx context.Context, mapping ACLMappingRequest) (err error) {
21-
req, err := as.client.newRequest(ctx, http.MethodPut, "/api/v1/acl/mapping", withBody(mapping))
21+
req, err := as.client.newRequest(ctx, http.MethodPut, "api/v1/acl/mapping", withBody(mapping))
2222
if err != nil {
2323
return
2424
}
@@ -27,7 +27,7 @@ func (as ACLService) AddProjectMapping(ctx context.Context, mapping ACLMappingRe
2727
}
2828

2929
func (as ACLService) RemoveProjectMapping(ctx context.Context, team, project uuid.UUID) (err error) {
30-
req, err := as.client.newRequest(ctx, http.MethodDelete, fmt.Sprintf("/api/v1/acl/mapping/team/%s/project/%s", team, project))
30+
req, err := as.client.newRequest(ctx, http.MethodDelete, fmt.Sprintf("api/v1/acl/mapping/team/%s/project/%s", team, project))
3131
if err != nil {
3232
return
3333
}
@@ -36,7 +36,7 @@ func (as ACLService) RemoveProjectMapping(ctx context.Context, team, project uui
3636
}
3737

3838
func (as ACLService) GetAllProjects(ctx context.Context, team uuid.UUID, po PageOptions) (p Page[Project], err error) {
39-
req, err := as.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/acl/team/%s", team), withPageOptions(po))
39+
req, err := as.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/acl/team/%s", team), withPageOptions(po))
4040
if err != nil {
4141
return
4242
}

‎analysis.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (as AnalysisService) Get(ctx context.Context, component, project, vulnerabi
8282
"vulnerability": vulnerability.String(),
8383
}
8484

85-
req, err := as.client.newRequest(ctx, http.MethodGet, "/api/v1/analysis", withParams(params))
85+
req, err := as.client.newRequest(ctx, http.MethodGet, "api/v1/analysis", withParams(params))
8686
if err != nil {
8787
return
8888
}
@@ -92,7 +92,7 @@ func (as AnalysisService) Get(ctx context.Context, component, project, vulnerabi
9292
}
9393

9494
func (as AnalysisService) Create(ctx context.Context, analysisReq AnalysisRequest) (a Analysis, err error) {
95-
req, err := as.client.newRequest(ctx, http.MethodPut, "/api/v1/analysis", withBody(analysisReq))
95+
req, err := as.client.newRequest(ctx, http.MethodPut, "api/v1/analysis", withBody(analysisReq))
9696
if err != nil {
9797
return
9898
}

‎bom.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (bs BOMService) ExportComponent(ctx context.Context, componentUUID uuid.UUI
5454
params["format"] = string(format)
5555
}
5656

57-
req, err := bs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/bom/cyclonedx/component/%s", componentUUID), withParams(params))
57+
req, err := bs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/bom/cyclonedx/component/%s", componentUUID), withParams(params))
5858
if err != nil {
5959
return
6060
}
@@ -74,7 +74,7 @@ func (bs BOMService) ExportProject(ctx context.Context, projectUUID uuid.UUID, f
7474
params["variant"] = string(variant)
7575
}
7676

77-
req, err := bs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/bom/cyclonedx/project/%s", projectUUID), withParams(params))
77+
req, err := bs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/bom/cyclonedx/project/%s", projectUUID), withParams(params))
7878
if err != nil {
7979
return
8080
}
@@ -86,7 +86,7 @@ func (bs BOMService) ExportProject(ctx context.Context, projectUUID uuid.UUID, f
8686
}
8787

8888
func (bs BOMService) Upload(ctx context.Context, uploadReq BOMUploadRequest) (token BOMUploadToken, err error) {
89-
req, err := bs.client.newRequest(ctx, http.MethodPut, "/api/v1/bom", withBody(uploadReq))
89+
req, err := bs.client.newRequest(ctx, http.MethodPut, "api/v1/bom", withBody(uploadReq))
9090
if err != nil {
9191
return
9292
}
@@ -138,7 +138,7 @@ func (bs BOMService) PostBom(ctx context.Context, uploadReq BOMUploadRequest) (t
138138
params["bom"] = append(params["bom"], uploadReq.BOM)
139139
}
140140

141-
req, err := bs.client.newRequest(ctx, http.MethodPost, "/api/v1/bom", withMultiPart(params))
141+
req, err := bs.client.newRequest(ctx, http.MethodPost, "api/v1/bom", withMultiPart(params))
142142
if err != nil {
143143
return
144144
}
@@ -165,7 +165,7 @@ func (bs BOMService) IsBeingProcessed(ctx context.Context, token BOMUploadToken)
165165
return bs.client.Event.IsBeingProcessed(ctx, EventToken(token))
166166
}
167167

168-
req, err := bs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/bom/token/%s", token))
168+
req, err := bs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/bom/token/%s", token))
169169
if err != nil {
170170
return false, err
171171
}

‎component.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (cs ComponentService) Get(ctx context.Context, componentUUID uuid.UUID) (c
8484
return
8585
}
8686

87-
req, err := cs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/component/%s", componentUUID))
87+
req, err := cs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/component/%s", componentUUID))
8888
if err != nil {
8989
return
9090
}
@@ -99,7 +99,7 @@ func (cs ComponentService) GetAll(ctx context.Context, projectUUID uuid.UUID, po
9999
return
100100
}
101101

102-
req, err := cs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/component/project/%s", projectUUID), withPageOptions(po), withComponentFilterOptions(filterOptions))
102+
req, err := cs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/component/project/%s", projectUUID), withPageOptions(po), withComponentFilterOptions(filterOptions))
103103
if err != nil {
104104
return
105105
}
@@ -133,7 +133,7 @@ func (cs ComponentService) Create(ctx context.Context, projectUUID uuid.UUID, co
133133
return
134134
}
135135

136-
req, err := cs.client.newRequest(ctx, http.MethodPut, fmt.Sprintf("/api/v1/component/project/%s", projectUUID), withBody(component))
136+
req, err := cs.client.newRequest(ctx, http.MethodPut, fmt.Sprintf("api/v1/component/project/%s", projectUUID), withBody(component))
137137
if err != nil {
138138
return
139139
}
@@ -148,7 +148,7 @@ func (cs ComponentService) Update(ctx context.Context, component Component) (c C
148148
return
149149
}
150150

151-
req, err := cs.client.newRequest(ctx, http.MethodPost, "/api/v1/component", withBody(component))
151+
req, err := cs.client.newRequest(ctx, http.MethodPost, "api/v1/component", withBody(component))
152152
if err != nil {
153153
return
154154
}
@@ -163,7 +163,7 @@ func (cs ComponentService) Delete(ctx context.Context, componentUUID uuid.UUID)
163163
return
164164
}
165165

166-
req, err := cs.client.newRequest(ctx, http.MethodDelete, fmt.Sprintf("/api/v1/component/%s", componentUUID))
166+
req, err := cs.client.newRequest(ctx, http.MethodDelete, fmt.Sprintf("api/v1/component/%s", componentUUID))
167167
if err != nil {
168168
return
169169
}
@@ -178,7 +178,7 @@ func (cs ComponentService) GetProperties(ctx context.Context, componentUUID uuid
178178
return
179179
}
180180

181-
req, err := cs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/component/%s/property", componentUUID))
181+
req, err := cs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/component/%s/property", componentUUID))
182182
if err != nil {
183183
return
184184
}
@@ -193,7 +193,7 @@ func (cs ComponentService) CreateProperty(ctx context.Context, componentUUID uui
193193
return
194194
}
195195

196-
req, err := cs.client.newRequest(ctx, http.MethodPut, fmt.Sprintf("/api/v1/component/%s/property", componentUUID), withBody(property))
196+
req, err := cs.client.newRequest(ctx, http.MethodPut, fmt.Sprintf("api/v1/component/%s/property", componentUUID), withBody(property))
197197
if err != nil {
198198
return
199199
}
@@ -208,7 +208,7 @@ func (cs ComponentService) DeleteProperty(ctx context.Context, componentUUID, pr
208208
return
209209
}
210210

211-
req, err := cs.client.newRequest(ctx, http.MethodDelete, fmt.Sprintf("/api/v1/component/%s/property/%s", componentUUID, propertyUUID))
211+
req, err := cs.client.newRequest(ctx, http.MethodDelete, fmt.Sprintf("api/v1/component/%s/property/%s", componentUUID, propertyUUID))
212212
if err != nil {
213213
return
214214
}
@@ -223,7 +223,7 @@ func (cs ComponentService) GetByHash(ctx context.Context, hash string, po PageOp
223223
return
224224
}
225225

226-
req, err := cs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/component/hash/%s", hash), withPageOptions(po), withSortOptions(so))
226+
req, err := cs.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/component/hash/%s", hash), withPageOptions(po), withSortOptions(so))
227227
if err != nil {
228228
return
229229
}
@@ -247,7 +247,7 @@ func (cs ComponentService) GetByIdentity(ctx context.Context, po PageOptions, so
247247
return
248248
}
249249

250-
req, err := cs.client.newRequest(ctx, http.MethodGet, "/api/v1/component/identity", withPageOptions(po), withSortOptions(so), withComponentIdentityOptions(io))
250+
req, err := cs.client.newRequest(ctx, http.MethodGet, "api/v1/component/identity", withPageOptions(po), withSortOptions(so), withComponentIdentityOptions(io))
251251
if err != nil {
252252
return
253253
}
@@ -296,7 +296,7 @@ func (cs ComponentService) IdentifyInternal(ctx context.Context) (err error) {
296296
return
297297
}
298298

299-
req, err := cs.client.newRequest(ctx, http.MethodGet, "/api/v1/component/internal/identify")
299+
req, err := cs.client.newRequest(ctx, http.MethodGet, "api/v1/component/internal/identify")
300300
if err != nil {
301301
return
302302
}

‎config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type ConfigService struct {
2020
}
2121

2222
func (cs ConfigService) GetAll(ctx context.Context) (cps []ConfigProperty, err error) {
23-
req, err := cs.client.newRequest(ctx, http.MethodGet, "/api/v1/configProperty")
23+
req, err := cs.client.newRequest(ctx, http.MethodGet, "api/v1/configProperty")
2424
if err != nil {
2525
return
2626
}
@@ -46,7 +46,7 @@ func (cs ConfigService) Get(ctx context.Context, groupName, propertyName string)
4646
}
4747

4848
func (cs ConfigService) Update(ctx context.Context, config ConfigProperty) (cp ConfigProperty, err error) {
49-
req, err := cs.client.newRequest(ctx, http.MethodPost, "/api/v1/configProperty", withBody(config))
49+
req, err := cs.client.newRequest(ctx, http.MethodPost, "api/v1/configProperty", withBody(config))
5050
if err != nil {
5151
return
5252
}
@@ -55,7 +55,7 @@ func (cs ConfigService) Update(ctx context.Context, config ConfigProperty) (cp C
5555
}
5656

5757
func (cs ConfigService) UpdateAll(ctx context.Context, configs []ConfigProperty) (cps []ConfigProperty, err error) {
58-
req, err := cs.client.newRequest(ctx, http.MethodPost, "/api/v1/configProperty/aggregate", withBody(configs))
58+
req, err := cs.client.newRequest(ctx, http.MethodPost, "api/v1/configProperty/aggregate", withBody(configs))
5959
if err != nil {
6060
return
6161
}

‎event.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (es EventService) IsBeingProcessed(ctx context.Context, token EventToken) (
2727
return false, err
2828
}
2929

30-
req, err := es.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/event/token/%s", token))
30+
req, err := es.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/event/token/%s", token))
3131
if err != nil {
3232
return false, err
3333
}

‎finding.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (f FindingService) GetAll(ctx context.Context, projectUUID uuid.UUID, suppr
7272
"suppressed": strconv.FormatBool(suppressed),
7373
}
7474

75-
req, err := f.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/finding/project/%s", projectUUID), withParams(params), withPageOptions(po))
75+
req, err := f.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/finding/project/%s", projectUUID), withParams(params), withPageOptions(po))
7676
if err != nil {
7777
return
7878
}
@@ -88,7 +88,7 @@ func (f FindingService) GetAll(ctx context.Context, projectUUID uuid.UUID, suppr
8888

8989
// ExportFPF exports the findings of a given project in the File Packaging Format (FPF).
9090
func (f FindingService) ExportFPF(ctx context.Context, projectUUID uuid.UUID) (d []byte, err error) {
91-
req, err := f.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/finding/project/%s/export", projectUUID))
91+
req, err := f.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/finding/project/%s/export", projectUUID))
9292
if err != nil {
9393
return
9494
}
@@ -106,7 +106,7 @@ func (f FindingService) ExportFPF(ctx context.Context, projectUUID uuid.UUID) (d
106106
// AnalyzeProject triggers an analysis for a given project.
107107
// This feature is available in Dependency-Track v4.7.0 and newer.
108108
func (f FindingService) AnalyzeProject(ctx context.Context, projectUUID uuid.UUID) (token BOMUploadToken, err error) {
109-
req, err := f.client.newRequest(ctx, http.MethodPost, fmt.Sprintf("/api/v1/finding/project/%s/analyze", projectUUID))
109+
req, err := f.client.newRequest(ctx, http.MethodPost, fmt.Sprintf("api/v1/finding/project/%s/analyze", projectUUID))
110110
if err != nil {
111111
return
112112
}

‎ldap.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type MappedLdapGroup struct {
3131
}
3232

3333
func (s LDAPService) AddMapping(ctx context.Context, mapping MappedLdapGroupRequest) (g MappedLdapGroup, err error) {
34-
req, err := s.client.newRequest(ctx, http.MethodPut, "/api/v1/ldap/mapping", withBody(mapping))
34+
req, err := s.client.newRequest(ctx, http.MethodPut, "api/v1/ldap/mapping", withBody(mapping))
3535
if err != nil {
3636
return
3737
}
@@ -41,7 +41,7 @@ func (s LDAPService) AddMapping(ctx context.Context, mapping MappedLdapGroupRequ
4141
}
4242

4343
func (s LDAPService) RemoveMapping(ctx context.Context, mappingId uuid.UUID) (err error) {
44-
req, err := s.client.newRequest(ctx, http.MethodDelete, fmt.Sprintf("/api/v1/ldap/mapping/%s", mappingId.String()))
44+
req, err := s.client.newRequest(ctx, http.MethodDelete, fmt.Sprintf("api/v1/ldap/mapping/%s", mappingId.String()))
4545
if err != nil {
4646
return
4747
}
@@ -51,7 +51,7 @@ func (s LDAPService) RemoveMapping(ctx context.Context, mappingId uuid.UUID) (er
5151
}
5252

5353
func (s LDAPService) GetAllAccessibleGroups(ctx context.Context, po PageOptions) (gs Page[string], err error) {
54-
req, err := s.client.newRequest(ctx, http.MethodGet, "/api/v1/ldap/groups", withPageOptions(po))
54+
req, err := s.client.newRequest(ctx, http.MethodGet, "api/v1/ldap/groups", withPageOptions(po))
5555
if err != nil {
5656
return
5757
}
@@ -62,7 +62,7 @@ func (s LDAPService) GetAllAccessibleGroups(ctx context.Context, po PageOptions)
6262
}
6363

6464
func (s LDAPService) GetTeamMappings(ctx context.Context, teamUUID uuid.UUID) (gs []MappedLdapGroup, err error) {
65-
req, err := s.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("/api/v1/ldap/team/%s", teamUUID.String()))
65+
req, err := s.client.newRequest(ctx, http.MethodGet, fmt.Sprintf("api/v1/ldap/team/%s", teamUUID.String()))
6666
if err != nil {
6767
return
6868
}
@@ -72,7 +72,7 @@ func (s LDAPService) GetTeamMappings(ctx context.Context, teamUUID uuid.UUID) (g
7272
}
7373

7474
func (s LDAPService) GetUsers(ctx context.Context, po PageOptions) (us Page[LdapUser], err error) {
75-
req, err := s.client.newRequest(ctx, http.MethodGet, "/api/v1/user/ldap", withPageOptions(po))
75+
req, err := s.client.newRequest(ctx, http.MethodGet, "api/v1/user/ldap", withPageOptions(po))
7676
if err != nil {
7777
return
7878
}
@@ -83,7 +83,7 @@ func (s LDAPService) GetUsers(ctx context.Context, po PageOptions) (us Page[Ldap
8383
}
8484

8585
func (s LDAPService) CreateUser(ctx context.Context, user LdapUser) (userOut LdapUser, err error) {
86-
req, err := s.client.newRequest(ctx, http.MethodPut, "/api/v1/user/ldap", withBody(user))
86+
req, err := s.client.newRequest(ctx, http.MethodPut, "api/v1/user/ldap", withBody(user))
8787
if err != nil {
8888
return
8989
}
@@ -93,7 +93,7 @@ func (s LDAPService) CreateUser(ctx context.Context, user LdapUser) (userOut Lda
9393
}
9494

9595
func (s LDAPService) DeleteUser(ctx context.Context, user LdapUser) (err error) {
96-
req, err := s.client.newRequest(ctx, http.MethodDelete, "/api/v1/user/ldap", withBody(user))
96+
req, err := s.client.newRequest(ctx, http.MethodDelete, "api/v1/user/ldap", withBody(user))
9797
if err != nil {
9898
return
9999
}

‎license.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type LicenseService struct {
2626
}
2727

2828
func (l LicenseService) GetAll(ctx context.Context, po PageOptions) (p Page[License], err error) {
29-
req, err := l.client.newRequest(ctx, http.MethodGet, "/api/v1/license", withPageOptions(po))
29+
req, err := l.client.newRequest(ctx, http.MethodGet, "api/v1/license", withPageOptions(po))
3030
if err != nil {
3131
return
3232
}

0 commit comments

Comments
 (0)