Skip to content

Commit 9ce57f5

Browse files
authored
ROX-29092: Remove UiEndpoint and DataEndpoint from the FM private api (#2328)
1 parent 9f78389 commit 9ce57f5

File tree

6 files changed

+5
-79
lines changed

6 files changed

+5
-79
lines changed

internal/central/pkg/api/private/api/openapi.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -503,16 +503,6 @@ components:
503503
type: array
504504
oidc:
505505
$ref: '#/components/schemas/ManagedCentral_allOf_spec_additionalAuthProvider_oidc'
506-
ManagedCentral_allOf_spec_uiEndpoint:
507-
description: 'Deprecated: use uiHost instead'
508-
properties:
509-
host:
510-
type: string
511-
ManagedCentral_allOf_spec_dataEndpoint:
512-
description: 'Deprecated: use dataHost instead'
513-
properties:
514-
host:
515-
type: string
516506
ManagedCentral_allOf_spec:
517507
properties:
518508
instanceType:
@@ -536,10 +526,6 @@ components:
536526
dataHost:
537527
description: Handles Sensor connections
538528
type: string
539-
uiEndpoint:
540-
$ref: '#/components/schemas/ManagedCentral_allOf_spec_uiEndpoint'
541-
dataEndpoint:
542-
$ref: '#/components/schemas/ManagedCentral_allOf_spec_dataEndpoint'
543529
ManagedCentral_allOf:
544530
properties:
545531
metadata:

internal/central/pkg/api/private/model_managed_central_all_of_spec.go

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/central/pkg/api/private/model_managed_central_all_of_spec_data_endpoint.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

internal/central/pkg/api/private/model_managed_central_all_of_spec_ui_endpoint.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

internal/central/pkg/presenters/managedcentral.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,10 @@ func (c *ManagedCentralPresenter) presentManagedCentral(gitopsConfig gitops.Conf
136136
Issuer: from.AuthConfig.Issuer,
137137
},
138138
AdditionalAuthProvider: additionalAuthProvider,
139-
// TODO(ROX-29092): Remove after FSS is updated
140-
UiEndpoint: private.ManagedCentralAllOfSpecUiEndpoint{
141-
Host: from.GetUIHost(),
142-
},
143-
// TODO(ROX-29092): Remove after FSS is updated
144-
DataEndpoint: private.ManagedCentralAllOfSpecDataEndpoint{
145-
Host: from.GetDataHost(),
146-
},
147-
UiHost: from.GetUIHost(),
148-
DataHost: from.GetDataHost(),
149-
TenantResourcesValues: renderedCentral.Values,
150-
InstanceType: from.InstanceType,
139+
UiHost: from.GetUIHost(),
140+
DataHost: from.GetDataHost(),
141+
TenantResourcesValues: renderedCentral.Values,
142+
InstanceType: from.InstanceType,
151143
},
152144
RequestStatus: from.Status,
153145
}

openapi/fleet-manager-private.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -361,24 +361,6 @@ components:
361361
dataHost:
362362
type: string
363363
description: 'Handles Sensor connections'
364-
# Kept for backward compatibility
365-
# TODO(ROX-29092): Delete once FM/FS use uiHost
366-
uiEndpoint:
367-
type: object
368-
description: 'Deprecated: use uiHost instead'
369-
deprecated: true
370-
properties:
371-
host:
372-
type: string
373-
# Kept for backward compatibility
374-
# TODO(ROX-29092): Delete once FM/FS use dataHost
375-
dataEndpoint:
376-
type: object
377-
description: 'Deprecated: use dataHost instead'
378-
deprecated: true
379-
properties:
380-
host:
381-
type: string
382364
requestStatus:
383365
type: string
384366

0 commit comments

Comments
 (0)