Skip to content

Commit

Permalink
chore: update the kas-fleet-manager API to the latest version (#73)
Browse files Browse the repository at this point in the history
  • Loading branch information
Wei Li authored Jun 3, 2021
1 parent 478ac73 commit 5e28f2f
Show file tree
Hide file tree
Showing 80 changed files with 1,490 additions and 444 deletions.
61 changes: 45 additions & 16 deletions .openapi/kas-fleet-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,9 @@ components:
type: string
bootstrapServerHost:
type: string
deprecated: true
bootstrap_server_host:
type: string
created_at:
format: date-time
type: string
Expand Down Expand Up @@ -900,8 +903,14 @@ components:
type: string
clientID:
type: string
deprecated: true
client_id:
type: string
clientSecret:
type: string
deprecated: true
client_secret:
type: string
owner:
type: string
created_at:
Expand Down Expand Up @@ -935,6 +944,10 @@ components:
clientID:
description: 'client id of the service account'
type: string
deprecated: true
client_id:
description: 'client id of the service account'
type: string
name:
description: 'name of the service account'
type: string
Expand Down Expand Up @@ -1002,11 +1015,19 @@ components:
Timestamp:
type: integer
format: int64
deprecated: true
timestamp:
type: integer
format: int64
Value:
type: number
format: double
deprecated: true
value:
type: number
format: double
required:
- Value
- value
MetricsInstantQueryList:
allOf:
- type: object
Expand Down Expand Up @@ -1035,11 +1056,19 @@ components:
Timestamp:
type: integer
format: int64
deprecated: true
timestamp:
type: integer
format: int64
Value:
type: number
format: double
deprecated: true
value:
type: number
format: double
required:
- Value
- value


parameters:
Expand Down Expand Up @@ -1199,7 +1228,7 @@ components:
region: "us-east-1"
owner: "api_kafka_service"
name: "serviceapi"
bootstrapServerHost: "serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org"
bootstrap_server_host: "serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org"
created_at: "2020-10-05T12:51:24.053142Z"
updated_at: "2020-10-05T12:56:36.362208Z"
version: "2.6.0"
Expand All @@ -1214,7 +1243,7 @@ components:
region: "us-east-1"
owner: "api_kafka_service"
name: "serviceapi"
bootstrapServerHost: "serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org"
bootstrap_server_host: "serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org"
created_at: "2020-10-05T12:51:24.053142Z"
updated_at: "2020-10-05T12:56:36.362208Z"
failed_reason: "a reason the kafka request creation failed"
Expand Down Expand Up @@ -1242,8 +1271,8 @@ components:
href: "/api/kafkas_mgmt/v1/serviceaccounts/1"
name: "my-app-sa"
description: "service account for my app"
clientID: "SA-121212"
clientSecret: "secret"
client_id: "SA-121212"
client_secret: "secret"
owner: "test-user"
created_at: "2021-04-07T16:24:01+05:30"
ServiceAccountByIdExample:
Expand All @@ -1253,7 +1282,7 @@ components:
href: "/api/kafkas_mgmt/v1/serviceaccounts/1"
name: "my-app-sa"
description: "service account for my app"
clientID: "SA-121212"
client_id: "SA-121212"
owner: "test-user"
created_at: "2021-04-07T16:24:01+05:30"
ServiceAccountListItemExample:
Expand All @@ -1263,7 +1292,7 @@ components:
href: "/api/kafkas_mgmt/v1/serviceaccounts/1"
name: "my-app-sa"
description: "service account for my app"
clientID: "SA-121212"
client_id: "SA-121212"
owner: "test-user"
created_at: "2021-04-07T16:24:01+05:30"
MetricsRangeQueryExample:
Expand All @@ -1273,20 +1302,20 @@ components:
strimzi_io_cluster: kafka-service
topic: __consumer_offsets
values:
- Timestamp: 1611670230000
Value: 84154
- Timestamp: 1611670260000
Value: 85888
- Timestamp: 1611670290000
Value: 87622
- timestamp: 1611670230000
value: 84154
- timestamp: 1611670260000
value: 85888
- timestamp: 1611670290000
value: 87622
MetricsInstantQueryExample:
value:
metric:
__name__: kafka_server_brokertopicmetrics_bytes_in_total
strimzi_io_cluster: kafka-service
topic: __consumer_offsets
Timestamp: 1611670230000
Value: 84154
timestamp: 1611670230000
value: 84154
400DeletionExample:
value:
id: "103"
Expand Down
4 changes: 2 additions & 2 deletions endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import "golang.org/x/oauth2"

// Endpoint is the default OAuth endpoints for RHOAS
var Endpoint = oauth2.Endpoint{
AuthURL: "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/auth",
AuthURL: "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/auth",
TokenURL: "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token",
}
}
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ module github.com/redhat-developer/app-services-sdk-go

go 1.13

require (
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
)
require golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/redhat-developer/app-services-sdk-go/kafkaadmin v0.1.0 h1:6datQi9yC9tgxOrp25EF3B9XUgAOHCEpz9mufAqIaYg=
github.com/redhat-developer/app-services-sdk-go/kafkaadmin v0.1.0/go.mod h1:K31N16ceE4c1FE4US17qHqmJ86sUZaWBpmXkSUfSDFA=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
Expand Down
4 changes: 2 additions & 2 deletions kafkamgmt/apiv1/client/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Go API client for kafkamgmt
# Go API client for kafkamgmtclient

Kafka Service Fleet Manager is a Rest API to manage kafka instances and connectors.

Expand All @@ -22,7 +22,7 @@ go get golang.org/x/net/context
Put the package under your project folder and add the following in import:

```golang
import sw "./kafkamgmt"
import sw "./kafkamgmtclient"
```

To use a proxy, set the environment variable `HTTP_PROXY`:
Expand Down
61 changes: 45 additions & 16 deletions kafkamgmt/apiv1/client/api/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ components:
region: us-east-1
owner: api_kafka_service
name: serviceapi
bootstrapServerHost: serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org
bootstrap_server_host: serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org
created_at: 2020-10-05T12:51:24.053142Z
updated_at: 2020-10-05T12:56:36.362208Z
version: 2.6.0
Expand All @@ -929,7 +929,7 @@ components:
region: us-east-1
owner: api_kafka_service
name: serviceapi
bootstrapServerHost: serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org
bootstrap_server_host: serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org
created_at: 2020-10-05T12:51:24.053142Z
updated_at: 2020-10-05T12:56:36.362208Z
failed_reason: a reason the kafka request creation failed
Expand Down Expand Up @@ -957,8 +957,8 @@ components:
href: /api/kafkas_mgmt/v1/serviceaccounts/1
name: my-app-sa
description: service account for my app
clientID: SA-121212
clientSecret: secret
client_id: SA-121212
client_secret: secret
owner: test-user
created_at: 2021-04-07T16:24:01+05:30
ServiceAccountByIdExample:
Expand All @@ -968,7 +968,7 @@ components:
href: /api/kafkas_mgmt/v1/serviceaccounts/1
name: my-app-sa
description: service account for my app
clientID: SA-121212
client_id: SA-121212
owner: test-user
created_at: 2021-04-07T16:24:01+05:30
ServiceAccountListItemExample:
Expand All @@ -978,7 +978,7 @@ components:
href: /api/kafkas_mgmt/v1/serviceaccounts/1
name: my-app-sa
description: service account for my app
clientID: SA-121212
client_id: SA-121212
owner: test-user
created_at: 2021-04-07T16:24:01+05:30
MetricsRangeQueryExample:
Expand All @@ -988,20 +988,20 @@ components:
strimzi_io_cluster: kafka-service
topic: __consumer_offsets
values:
- Timestamp: 1611670230000
Value: 84154
- Timestamp: 1611670260000
Value: 85888
- Timestamp: 1611670290000
Value: 87622
- timestamp: 1611670230000
value: 84154
- timestamp: 1611670260000
value: 85888
- timestamp: 1611670290000
value: 87622
MetricsInstantQueryExample:
value:
metric:
__name__: kafka_server_brokertopicmetrics_bytes_in_total
strimzi_io_cluster: kafka-service
topic: __consumer_offsets
Timestamp: 1611670230000
Value: 84154
timestamp: 1611670230000
value: 84154
"400DeletionExample":
value:
id: "103"
Expand Down Expand Up @@ -1413,13 +1413,21 @@ components:
values:
properties:
Timestamp:
deprecated: true
format: int64
type: integer
timestamp:
format: int64
type: integer
Value:
deprecated: true
format: double
type: number
value:
format: double
type: number
required:
- Value
- value
type: object
MetricsInstantQueryList:
allOf:
Expand All @@ -1431,13 +1439,21 @@ components:
type: string
type: object
Timestamp:
deprecated: true
format: int64
type: integer
timestamp:
format: int64
type: integer
Value:
deprecated: true
format: double
type: number
value:
format: double
type: number
required:
- Value
- value
type: object
Error_allOf:
properties:
Expand Down Expand Up @@ -1472,6 +1488,9 @@ components:
name:
type: string
bootstrapServerHost:
deprecated: true
type: string
bootstrap_server_host:
type: string
created_at:
format: date-time
Expand Down Expand Up @@ -1566,8 +1585,14 @@ components:
description:
type: string
clientID:
deprecated: true
type: string
client_id:
type: string
clientSecret:
deprecated: true
type: string
client_secret:
type: string
owner:
type: string
Expand All @@ -1581,6 +1606,10 @@ components:
description: server generated unique id of the service account
type: string
clientID:
deprecated: true
description: client id of the service account
type: string
client_id:
description: client id of the service account
type: string
name:
Expand Down
Loading

0 comments on commit 5e28f2f

Please sign in to comment.