From ecb01e1f8d8d0e7d416bb1ef3295bf5f5ba78076 Mon Sep 17 00:00:00 2001 From: Murad Biashimov Date: Tue, 6 Feb 2024 13:24:16 +0100 Subject: [PATCH] fix: do no generate query params --- client_generated.go | 3 +-- generator/main.go | 5 +++-- handler/clickhouse/clickhouse.go | 29 +++-------------------------- handler/service/service.go | 6 +++--- 4 files changed, 10 insertions(+), 33 deletions(-) diff --git a/client_generated.go b/client_generated.go index f5e281d..7c67138 100644 --- a/client_generated.go +++ b/client_generated.go @@ -1,10 +1,9 @@ -// Code generated by go-client-codegen. DO NOT EDIT. +// Code generated by Aiven. DO NOT EDIT. package aiven import ( "context" - account "github.com/aiven/go-client-codegen/handler/account" accountauthentication "github.com/aiven/go-client-codegen/handler/accountauthentication" accountteam "github.com/aiven/go-client-codegen/handler/accountteam" diff --git a/generator/main.go b/generator/main.go index c085b2e..f504de6 100644 --- a/generator/main.go +++ b/generator/main.go @@ -21,7 +21,7 @@ import ( ) const ( - generatedHeader = "Code generated by go-client-codegen. DO NOT EDIT." + generatedHeader = "Code generated by Aiven. DO NOT EDIT." versionIDParam = `/{version_id:latest|\d+}` configPrefix = "GEN" ) @@ -108,7 +108,7 @@ func exec() error { } pkgs[pkg] = append(pkgs[pkg], p) - params := make([]*Parameter, 0, len(p.Parameters)) + params := make([]*Parameter, 0) for _, ref := range p.Parameters { parts := strings.Split(ref.Ref, "/") @@ -121,6 +121,7 @@ func exec() error { if param.In != ParameterInPath { log.Printf("%q param %s in %q", p.OperationID, param.Name, param.In) + continue } param.Ref = ref.Ref diff --git a/handler/clickhouse/clickhouse.go b/handler/clickhouse/clickhouse.go index f4254d9..bcb0f90 100644 --- a/handler/clickhouse/clickhouse.go +++ b/handler/clickhouse/clickhouse.go @@ -22,7 +22,7 @@ type Handler interface { // ServiceClickHouseQueryStats return statistics on recent queries // GET /project/{project}/service/{service_name}/clickhouse/query/stats // https://api.aiven.io/doc/#tag/Service:_ClickHouse/operation/ServiceClickHouseQueryStats - ServiceClickHouseQueryStats(ctx context.Context, project string, serviceName string, limit int, offset int, orderByType OrderByType) ([]QueryOut, error) + ServiceClickHouseQueryStats(ctx context.Context, project string, serviceName string) ([]QueryOut, error) // ServiceClickHouseTieredStorageSummary get the ClickHouse tiered storage summary // GET /project/{project}/service/{service_name}/clickhouse/tiered-storage/summary @@ -52,8 +52,8 @@ func (h *ClickHouseHandler) ServiceClickHouseDatabaseDelete(ctx context.Context, _, err := h.doer.Do(ctx, "ServiceClickHouseDatabaseDelete", "DELETE", path, nil) return err } -func (h *ClickHouseHandler) ServiceClickHouseQueryStats(ctx context.Context, project string, serviceName string, limit int, offset int, orderByType OrderByType) ([]QueryOut, error) { - path := fmt.Sprintf("/project/%s/service/%s/clickhouse/query/stats", project, serviceName, limit, offset, orderByType) +func (h *ClickHouseHandler) ServiceClickHouseQueryStats(ctx context.Context, project string, serviceName string) ([]QueryOut, error) { + path := fmt.Sprintf("/project/%s/service/%s/clickhouse/query/stats", project, serviceName) b, err := h.doer.Do(ctx, "ServiceClickHouseQueryStats", "GET", path, nil) out := new(serviceClickHouseQueryStatsOut) err = json.Unmarshal(b, out) @@ -78,29 +78,6 @@ type HourlyOut struct { HourStart string `json:"hour_start"` PeakStoredBytes int `json:"peak_stored_bytes"` } -type OrderByType string - -const ( - OrderByTypeCallsasc OrderByType = "calls:asc" - OrderByTypeCallsdesc OrderByType = "calls:desc" - OrderByTypeMinTimeasc OrderByType = "min_time:asc" - OrderByTypeMinTimedesc OrderByType = "min_time:desc" - OrderByTypeMaxTimeasc OrderByType = "max_time:asc" - OrderByTypeMaxTimedesc OrderByType = "max_time:desc" - OrderByTypeMeanTimeasc OrderByType = "mean_time:asc" - OrderByTypeMeanTimedesc OrderByType = "mean_time:desc" - OrderByTypeP95Timeasc OrderByType = "p95_time:asc" - OrderByTypeP95Timedesc OrderByType = "p95_time:desc" - OrderByTypeStddevTimeasc OrderByType = "stddev_time:asc" - OrderByTypeStddevTimedesc OrderByType = "stddev_time:desc" - OrderByTypeTotalTimeasc OrderByType = "total_time:asc" - OrderByTypeTotalTimedesc OrderByType = "total_time:desc" -) - -func OrderByTypeChoices() []string { - return []string{"calls:asc", "calls:desc", "min_time:asc", "min_time:desc", "max_time:asc", "max_time:desc", "mean_time:asc", "mean_time:desc", "p95_time:asc", "p95_time:desc", "stddev_time:asc", "stddev_time:desc", "total_time:asc", "total_time:desc"} -} - type QueryOut struct { Calls *int `json:"calls,omitempty"` Database string `json:"database,omitempty"` diff --git a/handler/service/service.go b/handler/service/service.go index 96135d9..71c2871 100644 --- a/handler/service/service.go +++ b/handler/service/service.go @@ -158,7 +158,7 @@ type Handler interface { // ServiceUpdate update service configuration // PUT /project/{project}/service/{service_name} // https://api.aiven.io/doc/#tag/Service/operation/ServiceUpdate - ServiceUpdate(ctx context.Context, project string, serviceName string, allowUncleanPoweroff bool, in *ServiceUpdateIn) (*ServiceUpdateOut, error) + ServiceUpdate(ctx context.Context, project string, serviceName string, in *ServiceUpdateIn) (*ServiceUpdateOut, error) } func NewHandler(doer doer) ServiceHandler { @@ -433,8 +433,8 @@ func (h *ServiceHandler) ServiceTaskGet(ctx context.Context, project string, ser } return &out.Task, nil } -func (h *ServiceHandler) ServiceUpdate(ctx context.Context, project string, serviceName string, allowUncleanPoweroff bool, in *ServiceUpdateIn) (*ServiceUpdateOut, error) { - path := fmt.Sprintf("/project/%s/service/%s", project, serviceName, allowUncleanPoweroff) +func (h *ServiceHandler) ServiceUpdate(ctx context.Context, project string, serviceName string, in *ServiceUpdateIn) (*ServiceUpdateOut, error) { + path := fmt.Sprintf("/project/%s/service/%s", project, serviceName) b, err := h.doer.Do(ctx, "ServiceUpdate", "PUT", path, in) out := new(serviceUpdateOut) err = json.Unmarshal(b, out)