Skip to content

Commit

Permalink
Updating mappings for DataStores (#2454)
Browse files Browse the repository at this point in the history
* Updating mappings

* Updating OpenAPI based structs

* Update FE

---------

Co-authored-by: Jorge Padilla <jorge.esteban.padilla@gmail.com>
  • Loading branch information
danielbdias and jorgeepc committed Apr 27, 2023
1 parent 1485f41 commit 2cc181b
Show file tree
Hide file tree
Showing 17 changed files with 364 additions and 152 deletions.
8 changes: 4 additions & 4 deletions api/dataStores.yaml
Expand Up @@ -31,11 +31,11 @@ components:
$ref: "#/components/schemas/GRPCClientSettings"
tempo:
$ref: "#/components/schemas/BaseClient"
openSearch:
opensearch:
$ref: "#/components/schemas/ElasticSearch"
elasticApm:
elasticapm:
$ref: "#/components/schemas/ElasticSearch"
signalFx:
signalfx:
$ref: "#/components/schemas/SignalFX"
awsxray:
$ref: "#/components/schemas/AwsXRay"
Expand Down Expand Up @@ -158,7 +158,7 @@ components:
type: string
SupportedDataStores:
type: string
enum: [jaeger, openSearch, tempo, signalFx, otlp, elasticApm, newRelic, lightstep, datadog, awsxray]
enum: [jaeger, opensearch, tempo, signalfx, otlp, elasticapm, newrelic, lightstep, datadog, awsxray]
SupportedClients:
type: string
enum: [http, grpc]
2 changes: 1 addition & 1 deletion cli/formatters/datastore_list.go
Expand Up @@ -68,7 +68,7 @@ func (f dataStoreList) pretty(dataStores []openapi.DataStore) string {
}

func (f dataStoreList) getDefaultMark(dataStore openapi.DataStore) string {
if dataStore.IsDefault != nil && *dataStore.IsDefault {
if dataStore.Default != nil && *dataStore.Default {
return "*"
}

Expand Down
8 changes: 4 additions & 4 deletions cli/openapi/api_resource_api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

136 changes: 68 additions & 68 deletions cli/openapi/model_data_store.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2cc181b

Please sign in to comment.