Skip to content

Commit

Permalink
chore: resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Ubisoft-potato committed Jan 10, 2025
1 parent 955c821 commit 2929f7f
Show file tree
Hide file tree
Showing 6 changed files with 1,455 additions and 1,242 deletions.
121 changes: 121 additions & 0 deletions api-description/web-api.swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3670,6 +3670,57 @@ paths:
type: string
tags:
- segment
delete:
summary: Delete
description: Delete a segment.
operationId: web.v1.segment.delete
responses:
"200":
description: A successful response.
schema:
$ref: '#/definitions/featureDeleteSegmentResponse'
"400":
description: Returned for bad requests that may have failed validation.
schema:
$ref: '#/definitions/googlerpcStatus'
examples:
application/json:
code: 3
details: []
message: invalid arguments error
"401":
description: Request could not be authenticated (authentication required).
schema:
$ref: '#/definitions/googlerpcStatus'
examples:
application/json:
code: 16
details: []
message: not authenticated
"503":
description: Returned for internal errors.
schema:
$ref: '#/definitions/googlerpcStatus'
examples:
application/json:
code: 13
details: []
message: internal
default:
description: An unexpected error response.
schema:
$ref: '#/definitions/googlerpcStatus'
parameters:
- name: id
in: query
required: false
type: string
- name: environmentId
in: query
required: false
type: string
tags:
- segment
post:
summary: Create
description: Create a segment.
Expand Down Expand Up @@ -3718,6 +3769,54 @@ paths:
$ref: '#/definitions/featureCreateSegmentRequest'
tags:
- segment
patch:
summary: Update
description: Update a segment.
operationId: web.v1.segment.update
responses:
"200":
description: A successful response.
schema:
$ref: '#/definitions/featureUpdateSegmentResponse'
"400":
description: Returned for bad requests that may have failed validation.
schema:
$ref: '#/definitions/googlerpcStatus'
examples:
application/json:
code: 3
details: []
message: invalid arguments error
"401":
description: Request could not be authenticated (authentication required).
schema:
$ref: '#/definitions/googlerpcStatus'
examples:
application/json:
code: 16
details: []
message: not authenticated
"503":
description: Returned for internal errors.
schema:
$ref: '#/definitions/googlerpcStatus'
examples:
application/json:
code: 13
details: []
message: internal
default:
description: An unexpected error response.
schema:
$ref: '#/definitions/googlerpcStatus'
parameters:
- name: body
in: body
required: true
schema:
$ref: '#/definitions/featureUpdateSegmentRequest'
tags:
- segment
/v1/segment_users/bulk_upload:
post:
summary: Bulk upload
Expand Down Expand Up @@ -6466,8 +6565,30 @@ definitions:
type: object
featureUpdateFlagTriggerResponse:
type: object
featureUpdateSegmentRequest:
type: object
properties:
id:
type: string
commands:
type: array
items:
type: object
$ref: '#/definitions/featureCommand'
description: deprecated
environmentId:
type: string
name:
type: string
description:
type: string
required:
- environmentId
featureUpdateSegmentResponse:
type: object
properties:
segment:
$ref: '#/definitions/featureSegment'
featureUserEvaluations:
type: object
properties:
Expand Down
2 changes: 1 addition & 1 deletion manifests/bucketeer/charts/api/values.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions manifests/bucketeer/charts/web/values.yaml

Large diffs are not rendered by default.

Binary file modified proto/auditlog/proto_descriptor.pb
Binary file not shown.
Loading

0 comments on commit 2929f7f

Please sign in to comment.