Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: remove nested orgs labels route (#19104)

pull/19164/head
Alirie Gray 2020-07-30 10:53:14 -07:00 committed by GitHub
parent 8dd8d1f79e
commit d1b8e98798
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,7 +3,8 @@
### Breaking
1. [19066](https://github.com/influxdata/influxdb/pull/19066): Drop deprecated /packages route tree
1. [19116](https://github.com/influxdata/influxdb/pull/19116): Support more types for template envRef default value and require explicit default values
1. [19116](https://github.com/influxdata/influxdb/pull/19116): Support more types for template envRef default value and require explicit default values
1. [19104](https://github.com/influxdata/influxdb/pull/19104): Remove orgs/labels nested routes from the API.
### Features

2
cmd/influxd/launcher/launcher.go
View File

@ -1114,7 +1114,7 @@ func (m *Launcher) run(ctx context.Context) (err error) {
sessionHTTPServer = session.NewSessionHandler(m.log.With(zap.String("handler", "session")), sessionSvc, ts.UserSvc, ts.PasswordSvc)
}
orgHTTPServer := ts.NewOrgHTTPHandler(m.log, labelSvc, secret.NewAuthedService(secretSvc))
orgHTTPServer := ts.NewOrgHTTPHandler(m.log, secret.NewAuthedService(secretSvc))
bucketHTTPServer := ts.NewBucketHTTPHandler(m.log, labelSvc)

95
http/swagger.yml
View File

@ -4083,101 +4083,6 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/Error"
"/orgs/{orgID}/labels":
get:
operationId: GetOrgsIDLabels
tags:
- Organizations
summary: List all labels for a organization
parameters:
- $ref: "#/components/parameters/TraceSpan"
- in: path
name: orgID
schema:
type: string
required: true
description: The organization ID.
responses:
"200":
description: A list of all labels for an organization
content:
application/json:
schema:
$ref: "#/components/schemas/LabelsResponse"
default:
description: Unexpected error
content:
application/json:
schema:
$ref: "#/components/schemas/Error"
post:
operationId: PostOrgsIDLabels
tags:
- Organizations
summary: Add a label to an organization
parameters:
- $ref: "#/components/parameters/TraceSpan"
- in: path
name: orgID
schema:
type: string
required: true
description: The organization ID.
requestBody:
description: Label to add
required: true
content:
application/json:
schema:
$ref: "#/components/schemas/LabelMapping"
responses:
"201":
description: Returns the created label
content:
application/json:
schema:
$ref: "#/components/schemas/LabelResponse"
default:
description: Unexpected error
content:
application/json:
schema:
$ref: "#/components/schemas/Error"
"/orgs/{orgID}/labels/{labelID}":
delete:
operationId: DeleteOrgsIDLabelsID
tags:
- Organizations
summary: Delete a label from an organization
parameters:
- $ref: "#/components/parameters/TraceSpan"
- in: path
name: orgID
schema:
type: string
required: true
description: The organization ID.
- in: path
name: labelID
schema:
type: string
required: true
description: The label ID.
responses:
"204":
description: Delete has been accepted
"404":
description: Organization not found
content:
application/json:
schema:
$ref: "#/components/schemas/Error"
default:
description: Unexpected error
content:
application/json:
schema:
$ref: "#/components/schemas/Error"
"/orgs/{orgID}/secrets":
get:
operationId: GetOrgsIDSecrets

3
tenant/http_server_org.go
View File

@ -29,7 +29,7 @@ func (h *OrgHandler) Prefix() string {
}
// NewHTTPOrgHandler constructs a new http server.
func NewHTTPOrgHandler(log *zap.Logger, orgService influxdb.OrganizationService, urm http.Handler, labelHandler http.Handler, secretHandler http.Handler) *OrgHandler {
func NewHTTPOrgHandler(log *zap.Logger, orgService influxdb.OrganizationService, urm http.Handler, secretHandler http.Handler) *OrgHandler {
svr := &OrgHandler{
api: kithttp.NewAPI(kithttp.WithLog(log)),
log: log,
@ -56,7 +56,6 @@ func NewHTTPOrgHandler(log *zap.Logger, orgService influxdb.OrganizationService,
mountableRouter := r.With(kithttp.ValidResource(svr.api, svr.lookupOrgByID))
mountableRouter.Mount("/members", urm)
mountableRouter.Mount("/owners", urm)
mountableRouter.Mount("/labels", labelHandler)
mountableRouter.Mount("/secrets", secretHandler)
})
})

2
tenant/http_server_org_test.go
View File

@ -30,7 +30,7 @@ func initHttpOrgService(f itesting.OrganizationFields, t *testing.T) (influxdb.O
}
}
handler := tenant.NewHTTPOrgHandler(zaptest.NewLogger(t), svc, nil, nil, nil)
handler := tenant.NewHTTPOrgHandler(zaptest.NewLogger(t), svc, nil, nil)
r := chi.NewRouter()
r.Mount(handler.Prefix(), handler)
server := httptest.NewServer(r)

5
tenant/service.go
View File

@ -38,11 +38,10 @@ func NewSystem(store *Store, log *zap.Logger, reg prometheus.Registerer, metricO
}
}
func (ts *TenantSystem) NewOrgHTTPHandler(log *zap.Logger, labelSvc influxdb.LabelService, secretSvc influxdb.SecretService) *OrgHandler {
func (ts *TenantSystem) NewOrgHTTPHandler(log *zap.Logger, secretSvc influxdb.SecretService) *OrgHandler {
secretHandler := secret.NewHandler(log, "id", secret.NewAuthedService(secretSvc))
urmHandler := NewURMHandler(log.With(zap.String("handler", "urm")), influxdb.OrgsResourceType, "id", ts.UserSvc, NewAuthedURMService(ts.OrgSvc, ts.UrmSvc))
labelHandler := label.NewHTTPEmbeddedHandler(log.With(zap.String("handler", "label")), influxdb.OrgsResourceType, labelSvc)
return NewHTTPOrgHandler(log.With(zap.String("handler", "org")), NewAuthedOrgService(ts.OrgSvc), urmHandler, labelHandler, secretHandler)
return NewHTTPOrgHandler(log.With(zap.String("handler", "org")), NewAuthedOrgService(ts.OrgSvc), urmHandler, secretHandler)
}
func (ts *TenantSystem) NewBucketHTTPHandler(log *zap.Logger, labelSvc influxdb.LabelService) *BucketHandler {