diff --git a/api/api_authorizations.gen.go b/api/api_authorizations.gen.go index 38f5900..3867936 100644 --- a/api/api_authorizations.gen.go +++ b/api/api_authorizations.gen.go @@ -131,31 +131,11 @@ type AuthorizationsApi interface { * @return Authorization */ PostAuthorizationsExecuteWithHttpInfo(r ApiPostAuthorizationsRequest) (Authorization, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() AuthorizationsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() AuthorizationsApi } // AuthorizationsApiService AuthorizationsApi service type AuthorizationsApiService service -func (a *AuthorizationsApiService) OnlyOSS() AuthorizationsApi { - a.isOnlyOSS = true - return a -} - -func (a *AuthorizationsApiService) OnlyCloud() AuthorizationsApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteAuthorizationsIDRequest struct { ctx _context.Context ApiService AuthorizationsApi @@ -265,28 +245,25 @@ func (a *AuthorizationsApiService) DeleteAuthorizationsIDExecuteWithHttpInfo(r A return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -449,28 +426,25 @@ func (a *AuthorizationsApiService) GetAuthorizationsExecuteWithHttpInfo(r ApiGet return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -485,19 +459,19 @@ func (a *AuthorizationsApiService) GetAuthorizationsExecuteWithHttpInfo(r ApiGet body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -616,28 +590,25 @@ func (a *AuthorizationsApiService) GetAuthorizationsIDExecuteWithHttpInfo(r ApiG return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -652,19 +623,19 @@ func (a *AuthorizationsApiService) GetAuthorizationsIDExecuteWithHttpInfo(r ApiG body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -797,28 +768,25 @@ func (a *AuthorizationsApiService) PatchAuthorizationsIDExecuteWithHttpInfo(r Ap return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -833,19 +801,19 @@ func (a *AuthorizationsApiService) PatchAuthorizationsIDExecuteWithHttpInfo(r Ap body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -966,28 +934,25 @@ func (a *AuthorizationsApiService) PostAuthorizationsExecuteWithHttpInfo(r ApiPo return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -1013,19 +978,19 @@ func (a *AuthorizationsApiService) PostAuthorizationsExecuteWithHttpInfo(r ApiPo body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_backup.gen.go b/api/api_backup.gen.go index 6432888..d2df67b 100644 --- a/api/api_backup.gen.go +++ b/api/api_backup.gen.go @@ -90,31 +90,11 @@ type BackupApi interface { * @return *os.File */ GetBackupShardIdExecuteWithHttpInfo(r ApiGetBackupShardIdRequest) (*_nethttp.Response, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() BackupApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() BackupApi } // BackupApiService BackupApi service type BackupApiService service -func (a *BackupApiService) OnlyOSS() BackupApi { - a.isOnlyOSS = true - return a -} - -func (a *BackupApiService) OnlyCloud() BackupApi { - a.isOnlyCloud = true - return a -} - type ApiGetBackupKVRequest struct { ctx _context.Context ApiService BackupApi @@ -215,28 +195,25 @@ func (a *BackupApiService) GetBackupKVExecuteWithHttpInfo(r ApiGetBackupKVReques return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -365,28 +342,25 @@ func (a *BackupApiService) GetBackupMetadataExecuteWithHttpInfo(r ApiGetBackupMe return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -539,28 +513,25 @@ func (a *BackupApiService) GetBackupShardIdExecuteWithHttpInfo(r ApiGetBackupSha return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) diff --git a/api/api_bucket_schemas.gen.go b/api/api_bucket_schemas.gen.go index bb6e950..0d67167 100644 --- a/api/api_bucket_schemas.gen.go +++ b/api/api_bucket_schemas.gen.go @@ -115,31 +115,11 @@ type BucketSchemasApi interface { * @return MeasurementSchema */ UpdateMeasurementSchemaExecuteWithHttpInfo(r ApiUpdateMeasurementSchemaRequest) (MeasurementSchema, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() BucketSchemasApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() BucketSchemasApi } // BucketSchemasApiService BucketSchemasApi service type BucketSchemasApiService service -func (a *BucketSchemasApiService) OnlyOSS() BucketSchemasApi { - a.isOnlyOSS = true - return a -} - -func (a *BucketSchemasApiService) OnlyCloud() BucketSchemasApi { - a.isOnlyCloud = true - return a -} - type ApiCreateMeasurementSchemaRequest struct { ctx _context.Context ApiService BucketSchemasApi @@ -275,28 +255,25 @@ func (a *BucketSchemasApiService) CreateMeasurementSchemaExecuteWithHttpInfo(r A return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -313,19 +290,19 @@ func (a *BucketSchemasApiService) CreateMeasurementSchemaExecuteWithHttpInfo(r A body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -468,47 +445,44 @@ func (a *BucketSchemasApiService) GetMeasurementSchemaExecuteWithHttpInfo(r ApiG return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status return localVarReturnValue, localVarHTTPResponse, newErr } body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -651,28 +625,25 @@ func (a *BucketSchemasApiService) GetMeasurementSchemasExecuteWithHttpInfo(r Api return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -689,19 +660,19 @@ func (a *BucketSchemasApiService) GetMeasurementSchemasExecuteWithHttpInfo(r Api body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -855,28 +826,25 @@ func (a *BucketSchemasApiService) UpdateMeasurementSchemaExecuteWithHttpInfo(r A return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -893,19 +861,19 @@ func (a *BucketSchemasApiService) UpdateMeasurementSchemaExecuteWithHttpInfo(r A body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_buckets.gen.go b/api/api_buckets.gen.go index 52baf1c..1e06d3f 100644 --- a/api/api_buckets.gen.go +++ b/api/api_buckets.gen.go @@ -131,31 +131,11 @@ type BucketsApi interface { * @return Bucket */ PostBucketsExecuteWithHttpInfo(r ApiPostBucketsRequest) (Bucket, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() BucketsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() BucketsApi } // BucketsApiService BucketsApi service type BucketsApiService service -func (a *BucketsApiService) OnlyOSS() BucketsApi { - a.isOnlyOSS = true - return a -} - -func (a *BucketsApiService) OnlyCloud() BucketsApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteBucketsIDRequest struct { ctx _context.Context ApiService BucketsApi @@ -265,28 +245,25 @@ func (a *BucketsApiService) DeleteBucketsIDExecuteWithHttpInfo(r ApiDeleteBucket return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -496,28 +473,25 @@ func (a *BucketsApiService) GetBucketsExecuteWithHttpInfo(r ApiGetBucketsRequest return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -532,19 +506,19 @@ func (a *BucketsApiService) GetBucketsExecuteWithHttpInfo(r ApiGetBucketsRequest body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -663,28 +637,25 @@ func (a *BucketsApiService) GetBucketsIDExecuteWithHttpInfo(r ApiGetBucketsIDReq return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -699,19 +670,19 @@ func (a *BucketsApiService) GetBucketsIDExecuteWithHttpInfo(r ApiGetBucketsIDReq body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -844,28 +815,25 @@ func (a *BucketsApiService) PatchBucketsIDExecuteWithHttpInfo(r ApiPatchBucketsI return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -880,19 +848,19 @@ func (a *BucketsApiService) PatchBucketsIDExecuteWithHttpInfo(r ApiPatchBucketsI body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1013,28 +981,25 @@ func (a *BucketsApiService) PostBucketsExecuteWithHttpInfo(r ApiPostBucketsReque return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 422 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -1060,19 +1025,19 @@ func (a *BucketsApiService) PostBucketsExecuteWithHttpInfo(r ApiPostBucketsReque body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_config.gen.go b/api/api_config.gen.go index 841c88e..1394a3a 100644 --- a/api/api_config.gen.go +++ b/api/api_config.gen.go @@ -45,31 +45,11 @@ type ConfigApi interface { * @return Config */ GetConfigExecuteWithHttpInfo(r ApiGetConfigRequest) (Config, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() ConfigApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() ConfigApi } // ConfigApiService ConfigApi service type ConfigApiService service -func (a *ConfigApiService) OnlyOSS() ConfigApi { - a.isOnlyOSS = true - return a -} - -func (a *ConfigApiService) OnlyCloud() ConfigApi { - a.isOnlyCloud = true - return a -} - type ApiGetConfigRequest struct { ctx _context.Context ApiService ConfigApi @@ -170,28 +150,25 @@ func (a *ConfigApiService) GetConfigExecuteWithHttpInfo(r ApiGetConfigRequest) ( return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 401 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -217,19 +194,19 @@ func (a *ConfigApiService) GetConfigExecuteWithHttpInfo(r ApiGetConfigRequest) ( body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_dashboards.gen.go b/api/api_dashboards.gen.go index 7ad9afe..9c9f6aa 100644 --- a/api/api_dashboards.gen.go +++ b/api/api_dashboards.gen.go @@ -46,31 +46,11 @@ type DashboardsApi interface { * @return Dashboards */ GetDashboardsExecuteWithHttpInfo(r ApiGetDashboardsRequest) (Dashboards, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() DashboardsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() DashboardsApi } // DashboardsApiService DashboardsApi service type DashboardsApiService service -func (a *DashboardsApiService) OnlyOSS() DashboardsApi { - a.isOnlyOSS = true - return a -} - -func (a *DashboardsApiService) OnlyCloud() DashboardsApi { - a.isOnlyCloud = true - return a -} - type ApiGetDashboardsRequest struct { ctx _context.Context ApiService DashboardsApi @@ -275,28 +255,25 @@ func (a *DashboardsApiService) GetDashboardsExecuteWithHttpInfo(r ApiGetDashboar return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -311,19 +288,19 @@ func (a *DashboardsApiService) GetDashboardsExecuteWithHttpInfo(r ApiGetDashboar body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_dbrps.gen.go b/api/api_dbrps.gen.go index c6b3685..1b72dc8 100644 --- a/api/api_dbrps.gen.go +++ b/api/api_dbrps.gen.go @@ -131,31 +131,11 @@ type DBRPsApi interface { * @return DBRP */ PostDBRPExecuteWithHttpInfo(r ApiPostDBRPRequest) (DBRP, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() DBRPsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() DBRPsApi } // DBRPsApiService DBRPsApi service type DBRPsApiService service -func (a *DBRPsApiService) OnlyOSS() DBRPsApi { - a.isOnlyOSS = true - return a -} - -func (a *DBRPsApiService) OnlyCloud() DBRPsApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteDBRPIDRequest struct { ctx _context.Context ApiService DBRPsApi @@ -289,28 +269,25 @@ func (a *DBRPsApiService) DeleteDBRPIDExecuteWithHttpInfo(r ApiDeleteDBRPIDReque return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -520,28 +497,25 @@ func (a *DBRPsApiService) GetDBRPsExecuteWithHttpInfo(r ApiGetDBRPsRequest) (DBR return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -567,19 +541,19 @@ func (a *DBRPsApiService) GetDBRPsExecuteWithHttpInfo(r ApiGetDBRPsRequest) (DBR body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -722,28 +696,25 @@ func (a *DBRPsApiService) GetDBRPsIDExecuteWithHttpInfo(r ApiGetDBRPsIDRequest) return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -769,19 +740,19 @@ func (a *DBRPsApiService) GetDBRPsIDExecuteWithHttpInfo(r ApiGetDBRPsIDRequest) body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -938,28 +909,25 @@ func (a *DBRPsApiService) PatchDBRPIDExecuteWithHttpInfo(r ApiPatchDBRPIDRequest return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -996,19 +964,19 @@ func (a *DBRPsApiService) PatchDBRPIDExecuteWithHttpInfo(r ApiPatchDBRPIDRequest body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1129,28 +1097,25 @@ func (a *DBRPsApiService) PostDBRPExecuteWithHttpInfo(r ApiPostDBRPRequest) (DBR return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -1176,19 +1141,19 @@ func (a *DBRPsApiService) PostDBRPExecuteWithHttpInfo(r ApiPostDBRPRequest) (DBR body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_delete.gen.go b/api/api_delete.gen.go index ad066f8..6ae45ad 100644 --- a/api/api_delete.gen.go +++ b/api/api_delete.gen.go @@ -43,31 +43,11 @@ type DeleteApi interface { * content should be achieved through the returned response model if applicable. */ PostDeleteExecuteWithHttpInfo(r ApiPostDeleteRequest) (*_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() DeleteApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() DeleteApi } // DeleteApiService DeleteApi service type DeleteApiService service -func (a *DeleteApiService) OnlyOSS() DeleteApi { - a.isOnlyOSS = true - return a -} - -func (a *DeleteApiService) OnlyCloud() DeleteApi { - a.isOnlyCloud = true - return a -} - type ApiPostDeleteRequest struct { ctx _context.Context ApiService DeleteApi @@ -227,28 +207,25 @@ func (a *DeleteApiService) PostDeleteExecuteWithHttpInfo(r ApiPostDeleteRequest) return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) diff --git a/api/api_health.gen.go b/api/api_health.gen.go index 83d5008..d2b64d7 100644 --- a/api/api_health.gen.go +++ b/api/api_health.gen.go @@ -45,31 +45,11 @@ type HealthApi interface { * @return HealthCheck */ GetHealthExecuteWithHttpInfo(r ApiGetHealthRequest) (HealthCheck, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() HealthApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() HealthApi } // HealthApiService HealthApi service type HealthApiService service -func (a *HealthApiService) OnlyOSS() HealthApi { - a.isOnlyOSS = true - return a -} - -func (a *HealthApiService) OnlyCloud() HealthApi { - a.isOnlyCloud = true - return a -} - type ApiGetHealthRequest struct { ctx _context.Context ApiService HealthApi @@ -170,28 +150,25 @@ func (a *HealthApiService) GetHealthExecuteWithHttpInfo(r ApiGetHealthRequest) ( return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 503 { var v HealthCheck err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -217,19 +194,19 @@ func (a *HealthApiService) GetHealthExecuteWithHttpInfo(r ApiGetHealthRequest) ( body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_legacy_authorizations.gen.go b/api/api_legacy_authorizations.gen.go index c445cdc..c307b0f 100644 --- a/api/api_legacy_authorizations.gen.go +++ b/api/api_legacy_authorizations.gen.go @@ -151,31 +151,11 @@ type LegacyAuthorizationsApi interface { * content should be achieved through the returned response model if applicable. */ PostLegacyAuthorizationsIDPasswordExecuteWithHttpInfo(r ApiPostLegacyAuthorizationsIDPasswordRequest) (*_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() LegacyAuthorizationsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() LegacyAuthorizationsApi } // LegacyAuthorizationsApiService LegacyAuthorizationsApi service type LegacyAuthorizationsApiService service -func (a *LegacyAuthorizationsApiService) OnlyOSS() LegacyAuthorizationsApi { - a.isOnlyOSS = true - return a -} - -func (a *LegacyAuthorizationsApiService) OnlyCloud() LegacyAuthorizationsApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteLegacyAuthorizationsIDRequest struct { ctx _context.Context ApiService LegacyAuthorizationsApi @@ -285,28 +265,25 @@ func (a *LegacyAuthorizationsApiService) DeleteLegacyAuthorizationsIDExecuteWith return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -493,28 +470,25 @@ func (a *LegacyAuthorizationsApiService) GetLegacyAuthorizationsExecuteWithHttpI return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -529,19 +503,19 @@ func (a *LegacyAuthorizationsApiService) GetLegacyAuthorizationsExecuteWithHttpI body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -660,28 +634,25 @@ func (a *LegacyAuthorizationsApiService) GetLegacyAuthorizationsIDExecuteWithHtt return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -696,19 +667,19 @@ func (a *LegacyAuthorizationsApiService) GetLegacyAuthorizationsIDExecuteWithHtt body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -841,28 +812,25 @@ func (a *LegacyAuthorizationsApiService) PatchLegacyAuthorizationsIDExecuteWithH return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -877,19 +845,19 @@ func (a *LegacyAuthorizationsApiService) PatchLegacyAuthorizationsIDExecuteWithH body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1010,28 +978,25 @@ func (a *LegacyAuthorizationsApiService) PostLegacyAuthorizationsExecuteWithHttp return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -1057,19 +1022,19 @@ func (a *LegacyAuthorizationsApiService) PostLegacyAuthorizationsExecuteWithHttp body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1199,28 +1164,25 @@ func (a *LegacyAuthorizationsApiService) PostLegacyAuthorizationsIDPasswordExecu return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { diff --git a/api/api_organizations.gen.go b/api/api_organizations.gen.go index e306126..413d64e 100644 --- a/api/api_organizations.gen.go +++ b/api/api_organizations.gen.go @@ -196,31 +196,11 @@ type OrganizationsApi interface { * @return ResourceMember */ PostOrgsIDMembersExecuteWithHttpInfo(r ApiPostOrgsIDMembersRequest) (ResourceMember, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() OrganizationsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() OrganizationsApi } // OrganizationsApiService OrganizationsApi service type OrganizationsApiService service -func (a *OrganizationsApiService) OnlyOSS() OrganizationsApi { - a.isOnlyOSS = true - return a -} - -func (a *OrganizationsApiService) OnlyCloud() OrganizationsApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteOrgsIDRequest struct { ctx _context.Context ApiService OrganizationsApi @@ -330,28 +310,25 @@ func (a *OrganizationsApiService) DeleteOrgsIDExecuteWithHttpInfo(r ApiDeleteOrg return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -498,28 +475,25 @@ func (a *OrganizationsApiService) DeleteOrgsIDMembersIDExecuteWithHttpInfo(r Api return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -706,28 +680,25 @@ func (a *OrganizationsApiService) GetOrgsExecuteWithHttpInfo(r ApiGetOrgsRequest return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -742,19 +713,19 @@ func (a *OrganizationsApiService) GetOrgsExecuteWithHttpInfo(r ApiGetOrgsRequest body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -873,28 +844,25 @@ func (a *OrganizationsApiService) GetOrgsIDExecuteWithHttpInfo(r ApiGetOrgsIDReq return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -909,19 +877,19 @@ func (a *OrganizationsApiService) GetOrgsIDExecuteWithHttpInfo(r ApiGetOrgsIDReq body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1040,28 +1008,25 @@ func (a *OrganizationsApiService) GetOrgsIDMembersExecuteWithHttpInfo(r ApiGetOr return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -1087,19 +1052,19 @@ func (a *OrganizationsApiService) GetOrgsIDMembersExecuteWithHttpInfo(r ApiGetOr body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1232,28 +1197,25 @@ func (a *OrganizationsApiService) PatchOrgsIDExecuteWithHttpInfo(r ApiPatchOrgsI return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1268,19 +1230,19 @@ func (a *OrganizationsApiService) PatchOrgsIDExecuteWithHttpInfo(r ApiPatchOrgsI body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1401,28 +1363,25 @@ func (a *OrganizationsApiService) PostOrgsExecuteWithHttpInfo(r ApiPostOrgsReque return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1437,19 +1396,19 @@ func (a *OrganizationsApiService) PostOrgsExecuteWithHttpInfo(r ApiPostOrgsReque body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1582,28 +1541,25 @@ func (a *OrganizationsApiService) PostOrgsIDMembersExecuteWithHttpInfo(r ApiPost return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1618,19 +1574,19 @@ func (a *OrganizationsApiService) PostOrgsIDMembersExecuteWithHttpInfo(r ApiPost body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_query.gen.go b/api/api_query.gen.go index 17d2521..23cd762 100644 --- a/api/api_query.gen.go +++ b/api/api_query.gen.go @@ -45,31 +45,11 @@ type QueryApi interface { * @return *os.File */ PostQueryExecuteWithHttpInfo(r ApiPostQueryRequest) (*_nethttp.Response, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() QueryApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() QueryApi } // QueryApiService QueryApi service type QueryApiService service -func (a *QueryApiService) OnlyOSS() QueryApi { - a.isOnlyOSS = true - return a -} - -func (a *QueryApiService) OnlyCloud() QueryApi { - a.isOnlyCloud = true - return a -} - type ApiPostQueryRequest struct { ctx _context.Context ApiService QueryApi @@ -229,28 +209,25 @@ func (a *QueryApiService) PostQueryExecuteWithHttpInfo(r ApiPostQueryRequest) (* return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { diff --git a/api/api_remote_connections.gen.go b/api/api_remote_connections.gen.go index 1ebda35..a0a7f2d 100644 --- a/api/api_remote_connections.gen.go +++ b/api/api_remote_connections.gen.go @@ -131,31 +131,11 @@ type RemoteConnectionsApi interface { * @return RemoteConnection */ PostRemoteConnectionExecuteWithHttpInfo(r ApiPostRemoteConnectionRequest) (RemoteConnection, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() RemoteConnectionsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() RemoteConnectionsApi } // RemoteConnectionsApiService RemoteConnectionsApi service type RemoteConnectionsApiService service -func (a *RemoteConnectionsApiService) OnlyOSS() RemoteConnectionsApi { - a.isOnlyOSS = true - return a -} - -func (a *RemoteConnectionsApiService) OnlyCloud() RemoteConnectionsApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteRemoteConnectionByIDRequest struct { ctx _context.Context ApiService RemoteConnectionsApi @@ -265,28 +245,25 @@ func (a *RemoteConnectionsApiService) DeleteRemoteConnectionByIDExecuteWithHttpI return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -424,28 +401,25 @@ func (a *RemoteConnectionsApiService) GetRemoteConnectionByIDExecuteWithHttpInfo return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -471,19 +445,19 @@ func (a *RemoteConnectionsApiService) GetRemoteConnectionByIDExecuteWithHttpInfo body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -627,28 +601,25 @@ func (a *RemoteConnectionsApiService) GetRemoteConnectionsExecuteWithHttpInfo(r return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -674,19 +645,19 @@ func (a *RemoteConnectionsApiService) GetRemoteConnectionsExecuteWithHttpInfo(r body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -819,28 +790,25 @@ func (a *RemoteConnectionsApiService) PatchRemoteConnectionByIDExecuteWithHttpIn return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -877,19 +845,19 @@ func (a *RemoteConnectionsApiService) PatchRemoteConnectionByIDExecuteWithHttpIn body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -998,28 +966,25 @@ func (a *RemoteConnectionsApiService) PostRemoteConnectionExecuteWithHttpInfo(r return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -1045,19 +1010,19 @@ func (a *RemoteConnectionsApiService) PostRemoteConnectionExecuteWithHttpInfo(r body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_replications.gen.go b/api/api_replications.gen.go index fbd435a..80edec8 100644 --- a/api/api_replications.gen.go +++ b/api/api_replications.gen.go @@ -151,31 +151,11 @@ type ReplicationsApi interface { * content should be achieved through the returned response model if applicable. */ PostValidateReplicationByIDExecuteWithHttpInfo(r ApiPostValidateReplicationByIDRequest) (*_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() ReplicationsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() ReplicationsApi } // ReplicationsApiService ReplicationsApi service type ReplicationsApiService service -func (a *ReplicationsApiService) OnlyOSS() ReplicationsApi { - a.isOnlyOSS = true - return a -} - -func (a *ReplicationsApiService) OnlyCloud() ReplicationsApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteReplicationByIDRequest struct { ctx _context.Context ApiService ReplicationsApi @@ -285,28 +265,25 @@ func (a *ReplicationsApiService) DeleteReplicationByIDExecuteWithHttpInfo(r ApiD return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -444,28 +421,25 @@ func (a *ReplicationsApiService) GetReplicationByIDExecuteWithHttpInfo(r ApiGetR return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -491,19 +465,19 @@ func (a *ReplicationsApiService) GetReplicationByIDExecuteWithHttpInfo(r ApiGetR body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -659,28 +633,25 @@ func (a *ReplicationsApiService) GetReplicationsExecuteWithHttpInfo(r ApiGetRepl return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 404 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -706,19 +677,19 @@ func (a *ReplicationsApiService) GetReplicationsExecuteWithHttpInfo(r ApiGetRepl body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -863,28 +834,25 @@ func (a *ReplicationsApiService) PatchReplicationByIDExecuteWithHttpInfo(r ApiPa return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -921,19 +889,19 @@ func (a *ReplicationsApiService) PatchReplicationByIDExecuteWithHttpInfo(r ApiPa body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1066,28 +1034,25 @@ func (a *ReplicationsApiService) PostReplicationExecuteWithHttpInfo(r ApiPostRep return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -1113,19 +1078,19 @@ func (a *ReplicationsApiService) PostReplicationExecuteWithHttpInfo(r ApiPostRep body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1241,28 +1206,25 @@ func (a *ReplicationsApiService) PostValidateReplicationByIDExecuteWithHttpInfo( return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) diff --git a/api/api_resources.gen.go b/api/api_resources.gen.go index 5b7b23b..68b14c6 100644 --- a/api/api_resources.gen.go +++ b/api/api_resources.gen.go @@ -45,31 +45,11 @@ type ResourcesApi interface { * @return []string */ GetResourcesExecuteWithHttpInfo(r ApiGetResourcesRequest) ([]string, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() ResourcesApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() ResourcesApi } // ResourcesApiService ResourcesApi service type ResourcesApiService service -func (a *ResourcesApiService) OnlyOSS() ResourcesApi { - a.isOnlyOSS = true - return a -} - -func (a *ResourcesApiService) OnlyCloud() ResourcesApi { - a.isOnlyCloud = true - return a -} - type ApiGetResourcesRequest struct { ctx _context.Context ApiService ResourcesApi @@ -170,28 +150,25 @@ func (a *ResourcesApiService) GetResourcesExecuteWithHttpInfo(r ApiGetResourcesR return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -206,19 +183,19 @@ func (a *ResourcesApiService) GetResourcesExecuteWithHttpInfo(r ApiGetResourcesR body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_restore.gen.go b/api/api_restore.gen.go index 37b1ab5..f5d2112 100644 --- a/api/api_restore.gen.go +++ b/api/api_restore.gen.go @@ -128,31 +128,11 @@ type RestoreApi interface { * content should be achieved through the returned response model if applicable. */ PostRestoreShardIdExecuteWithHttpInfo(r ApiPostRestoreShardIdRequest) (*_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() RestoreApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() RestoreApi } // RestoreApiService RestoreApi service type RestoreApiService service -func (a *RestoreApiService) OnlyOSS() RestoreApi { - a.isOnlyOSS = true - return a -} - -func (a *RestoreApiService) OnlyCloud() RestoreApi { - a.isOnlyCloud = true - return a -} - type ApiPostRestoreBucketIDRequest struct { ctx _context.Context ApiService RestoreApi @@ -291,28 +271,25 @@ func (a *RestoreApiService) PostRestoreBucketIDExecuteWithHttpInfo(r ApiPostRest return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -327,19 +304,19 @@ func (a *RestoreApiService) PostRestoreBucketIDExecuteWithHttpInfo(r ApiPostRest body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -460,28 +437,25 @@ func (a *RestoreApiService) PostRestoreBucketMetadataExecuteWithHttpInfo(r ApiPo return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -496,19 +470,19 @@ func (a *RestoreApiService) PostRestoreBucketMetadataExecuteWithHttpInfo(r ApiPo body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -653,28 +627,25 @@ func (a *RestoreApiService) PostRestoreKVExecuteWithHttpInfo(r ApiPostRestoreKVR return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -689,19 +660,19 @@ func (a *RestoreApiService) PostRestoreKVExecuteWithHttpInfo(r ApiPostRestoreKVR body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -843,28 +814,25 @@ func (a *RestoreApiService) PostRestoreSQLExecuteWithHttpInfo(r ApiPostRestoreSQ return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1026,28 +994,25 @@ func (a *RestoreApiService) PostRestoreShardIdExecuteWithHttpInfo(r ApiPostResto return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { diff --git a/api/api_secrets.gen.go b/api/api_secrets.gen.go index ac01f70..98aa8d2 100644 --- a/api/api_secrets.gen.go +++ b/api/api_secrets.gen.go @@ -87,31 +87,11 @@ type SecretsApi interface { * content should be achieved through the returned response model if applicable. */ PostOrgsIDSecretsExecuteWithHttpInfo(r ApiPostOrgsIDSecretsRequest) (*_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() SecretsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() SecretsApi } // SecretsApiService SecretsApi service type SecretsApiService service -func (a *SecretsApiService) OnlyOSS() SecretsApi { - a.isOnlyOSS = true - return a -} - -func (a *SecretsApiService) OnlyCloud() SecretsApi { - a.isOnlyCloud = true - return a -} - type ApiGetOrgsIDSecretsRequest struct { ctx _context.Context ApiService SecretsApi @@ -224,28 +204,25 @@ func (a *SecretsApiService) GetOrgsIDSecretsExecuteWithHttpInfo(r ApiGetOrgsIDSe return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -260,19 +237,19 @@ func (a *SecretsApiService) GetOrgsIDSecretsExecuteWithHttpInfo(r ApiGetOrgsIDSe body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -402,28 +379,25 @@ func (a *SecretsApiService) PatchOrgsIDSecretsExecuteWithHttpInfo(r ApiPatchOrgs return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -561,28 +535,25 @@ func (a *SecretsApiService) PostOrgsIDSecretsExecuteWithHttpInfo(r ApiPostOrgsID return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { diff --git a/api/api_setup.gen.go b/api/api_setup.gen.go index 06860da..615cceb 100644 --- a/api/api_setup.gen.go +++ b/api/api_setup.gen.go @@ -68,31 +68,11 @@ type SetupApi interface { * @return OnboardingResponse */ PostSetupExecuteWithHttpInfo(r ApiPostSetupRequest) (OnboardingResponse, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() SetupApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() SetupApi } // SetupApiService SetupApi service type SetupApiService service -func (a *SetupApiService) OnlyOSS() SetupApi { - a.isOnlyOSS = true - return a -} - -func (a *SetupApiService) OnlyCloud() SetupApi { - a.isOnlyCloud = true - return a -} - type ApiGetSetupRequest struct { ctx _context.Context ApiService SetupApi @@ -194,47 +174,44 @@ func (a *SetupApiService) GetSetupExecuteWithHttpInfo(r ApiGetSetupRequest) (Inl return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status return localVarReturnValue, localVarHTTPResponse, newErr } body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -356,28 +333,25 @@ func (a *SetupApiService) PostSetupExecuteWithHttpInfo(r ApiPostSetupRequest) (O return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -392,19 +366,19 @@ func (a *SetupApiService) PostSetupExecuteWithHttpInfo(r ApiPostSetupRequest) (O body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_stacks.gen.go b/api/api_stacks.gen.go index adc6075..d0f585a 100644 --- a/api/api_stacks.gen.go +++ b/api/api_stacks.gen.go @@ -132,31 +132,11 @@ type StacksApi interface { * @return Stack */ UpdateStackExecuteWithHttpInfo(r ApiUpdateStackRequest) (Stack, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() StacksApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() StacksApi } // StacksApiService StacksApi service type StacksApiService service -func (a *StacksApiService) OnlyOSS() StacksApi { - a.isOnlyOSS = true - return a -} - -func (a *StacksApiService) OnlyCloud() StacksApi { - a.isOnlyCloud = true - return a -} - type ApiCreateStackRequest struct { ctx _context.Context ApiService StacksApi @@ -259,28 +239,25 @@ func (a *StacksApiService) CreateStackExecuteWithHttpInfo(r ApiCreateStackReques return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -295,19 +272,19 @@ func (a *StacksApiService) CreateStackExecuteWithHttpInfo(r ApiCreateStackReques body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -424,28 +401,25 @@ func (a *StacksApiService) DeleteStackExecuteWithHttpInfo(r ApiDeleteStackReques return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -601,28 +575,25 @@ func (a *StacksApiService) ListStacksExecuteWithHttpInfo(r ApiListStacksRequest) return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -637,19 +608,19 @@ func (a *StacksApiService) ListStacksExecuteWithHttpInfo(r ApiListStacksRequest) body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -756,28 +727,25 @@ func (a *StacksApiService) ReadStackExecuteWithHttpInfo(r ApiReadStackRequest) ( return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -792,19 +760,19 @@ func (a *StacksApiService) ReadStackExecuteWithHttpInfo(r ApiReadStackRequest) ( body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -925,28 +893,25 @@ func (a *StacksApiService) UpdateStackExecuteWithHttpInfo(r ApiUpdateStackReques return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -961,19 +926,19 @@ func (a *StacksApiService) UpdateStackExecuteWithHttpInfo(r ApiUpdateStackReques body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_tasks.gen.go b/api/api_tasks.gen.go index f7c7d41..67ebeaa 100644 --- a/api/api_tasks.gen.go +++ b/api/api_tasks.gen.go @@ -290,31 +290,11 @@ type TasksApi interface { * @return Run */ PostTasksIDRunsIDRetryExecuteWithHttpInfo(r ApiPostTasksIDRunsIDRetryRequest) (Run, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() TasksApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() TasksApi } // TasksApiService TasksApi service type TasksApiService service -func (a *TasksApiService) OnlyOSS() TasksApi { - a.isOnlyOSS = true - return a -} - -func (a *TasksApiService) OnlyCloud() TasksApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteTasksIDRequest struct { ctx _context.Context ApiService TasksApi @@ -425,28 +405,25 @@ func (a *TasksApiService) DeleteTasksIDExecuteWithHttpInfo(r ApiDeleteTasksIDReq return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -582,28 +559,25 @@ func (a *TasksApiService) DeleteTasksIDRunsIDExecuteWithHttpInfo(r ApiDeleteTask return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -814,28 +788,25 @@ func (a *TasksApiService) GetTasksExecuteWithHttpInfo(r ApiGetTasksRequest) (Tas return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -850,19 +821,19 @@ func (a *TasksApiService) GetTasksExecuteWithHttpInfo(r ApiGetTasksRequest) (Tas body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -981,28 +952,25 @@ func (a *TasksApiService) GetTasksIDExecuteWithHttpInfo(r ApiGetTasksIDRequest) return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1017,19 +985,19 @@ func (a *TasksApiService) GetTasksIDExecuteWithHttpInfo(r ApiGetTasksIDRequest) body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1148,28 +1116,25 @@ func (a *TasksApiService) GetTasksIDLogsExecuteWithHttpInfo(r ApiGetTasksIDLogsR return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1184,19 +1149,19 @@ func (a *TasksApiService) GetTasksIDLogsExecuteWithHttpInfo(r ApiGetTasksIDLogsR body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1363,28 +1328,25 @@ func (a *TasksApiService) GetTasksIDRunsExecuteWithHttpInfo(r ApiGetTasksIDRunsR return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1399,19 +1361,19 @@ func (a *TasksApiService) GetTasksIDRunsExecuteWithHttpInfo(r ApiGetTasksIDRunsR body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1542,28 +1504,25 @@ func (a *TasksApiService) GetTasksIDRunsIDExecuteWithHttpInfo(r ApiGetTasksIDRun return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1578,19 +1537,19 @@ func (a *TasksApiService) GetTasksIDRunsIDExecuteWithHttpInfo(r ApiGetTasksIDRun body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1721,28 +1680,25 @@ func (a *TasksApiService) GetTasksIDRunsIDLogsExecuteWithHttpInfo(r ApiGetTasksI return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1757,19 +1713,19 @@ func (a *TasksApiService) GetTasksIDRunsIDLogsExecuteWithHttpInfo(r ApiGetTasksI body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1903,28 +1859,25 @@ func (a *TasksApiService) PatchTasksIDExecuteWithHttpInfo(r ApiPatchTasksIDReque return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1939,19 +1892,19 @@ func (a *TasksApiService) PatchTasksIDExecuteWithHttpInfo(r ApiPatchTasksIDReque body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -2072,28 +2025,25 @@ func (a *TasksApiService) PostTasksExecuteWithHttpInfo(r ApiPostTasksRequest) (T return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -2108,19 +2058,19 @@ func (a *TasksApiService) PostTasksExecuteWithHttpInfo(r ApiPostTasksRequest) (T body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -2250,28 +2200,25 @@ func (a *TasksApiService) PostTasksIDRunsExecuteWithHttpInfo(r ApiPostTasksIDRun return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -2286,19 +2233,19 @@ func (a *TasksApiService) PostTasksIDRunsExecuteWithHttpInfo(r ApiPostTasksIDRun body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -2440,28 +2387,25 @@ func (a *TasksApiService) PostTasksIDRunsIDRetryExecuteWithHttpInfo(r ApiPostTas return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -2476,19 +2420,19 @@ func (a *TasksApiService) PostTasksIDRunsIDRetryExecuteWithHttpInfo(r ApiPostTas body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_telegrafs.gen.go b/api/api_telegrafs.gen.go index 2c80be6..5538d40 100644 --- a/api/api_telegrafs.gen.go +++ b/api/api_telegrafs.gen.go @@ -131,31 +131,11 @@ type TelegrafsApi interface { * @return Telegraf */ PutTelegrafsIDExecuteWithHttpInfo(r ApiPutTelegrafsIDRequest) (Telegraf, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() TelegrafsApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() TelegrafsApi } // TelegrafsApiService TelegrafsApi service type TelegrafsApiService service -func (a *TelegrafsApiService) OnlyOSS() TelegrafsApi { - a.isOnlyOSS = true - return a -} - -func (a *TelegrafsApiService) OnlyCloud() TelegrafsApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteTelegrafsIDRequest struct { ctx _context.Context ApiService TelegrafsApi @@ -265,28 +245,25 @@ func (a *TelegrafsApiService) DeleteTelegrafsIDExecuteWithHttpInfo(r ApiDeleteTe return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -413,28 +390,25 @@ func (a *TelegrafsApiService) GetTelegrafsExecuteWithHttpInfo(r ApiGetTelegrafsR return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -449,19 +423,19 @@ func (a *TelegrafsApiService) GetTelegrafsExecuteWithHttpInfo(r ApiGetTelegrafsR body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -592,28 +566,25 @@ func (a *TelegrafsApiService) GetTelegrafsIDExecuteWithHttpInfo(r ApiGetTelegraf return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -628,19 +599,19 @@ func (a *TelegrafsApiService) GetTelegrafsIDExecuteWithHttpInfo(r ApiGetTelegraf body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -761,28 +732,25 @@ func (a *TelegrafsApiService) PostTelegrafsExecuteWithHttpInfo(r ApiPostTelegraf return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -797,19 +765,19 @@ func (a *TelegrafsApiService) PostTelegrafsExecuteWithHttpInfo(r ApiPostTelegraf body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -942,28 +910,25 @@ func (a *TelegrafsApiService) PutTelegrafsIDExecuteWithHttpInfo(r ApiPutTelegraf return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -978,19 +943,19 @@ func (a *TelegrafsApiService) PutTelegrafsIDExecuteWithHttpInfo(r ApiPutTelegraf body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_templates.gen.go b/api/api_templates.gen.go index 1870543..1e5a709 100644 --- a/api/api_templates.gen.go +++ b/api/api_templates.gen.go @@ -66,31 +66,11 @@ type TemplatesApi interface { * @return []TemplateEntry */ ExportTemplateExecuteWithHttpInfo(r ApiExportTemplateRequest) ([]TemplateEntry, *_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() TemplatesApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() TemplatesApi } // TemplatesApiService TemplatesApi service type TemplatesApiService service -func (a *TemplatesApiService) OnlyOSS() TemplatesApi { - a.isOnlyOSS = true - return a -} - -func (a *TemplatesApiService) OnlyCloud() TemplatesApi { - a.isOnlyCloud = true - return a -} - type ApiApplyTemplateRequest struct { ctx _context.Context ApiService TemplatesApi @@ -193,28 +173,25 @@ func (a *TemplatesApiService) ApplyTemplateExecuteWithHttpInfo(r ApiApplyTemplat return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 422 { var v TemplateSummary err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) @@ -240,19 +217,19 @@ func (a *TemplatesApiService) ApplyTemplateExecuteWithHttpInfo(r ApiApplyTemplat body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -358,28 +335,25 @@ func (a *TemplatesApiService) ExportTemplateExecuteWithHttpInfo(r ApiExportTempl return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -394,19 +368,19 @@ func (a *TemplatesApiService) ExportTemplateExecuteWithHttpInfo(r ApiExportTempl body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } diff --git a/api/api_users.gen.go b/api/api_users.gen.go index d27a2c2..2440cf0 100644 --- a/api/api_users.gen.go +++ b/api/api_users.gen.go @@ -151,31 +151,11 @@ type UsersApi interface { * content should be achieved through the returned response model if applicable. */ PostUsersIDPasswordExecuteWithHttpInfo(r ApiPostUsersIDPasswordRequest) (*_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() UsersApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() UsersApi } // UsersApiService UsersApi service type UsersApiService service -func (a *UsersApiService) OnlyOSS() UsersApi { - a.isOnlyOSS = true - return a -} - -func (a *UsersApiService) OnlyCloud() UsersApi { - a.isOnlyCloud = true - return a -} - type ApiDeleteUsersIDRequest struct { ctx _context.Context ApiService UsersApi @@ -285,28 +265,25 @@ func (a *UsersApiService) DeleteUsersIDExecuteWithHttpInfo(r ApiDeleteUsersIDReq return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -481,28 +458,25 @@ func (a *UsersApiService) GetUsersExecuteWithHttpInfo(r ApiGetUsersRequest) (Use return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -517,19 +491,19 @@ func (a *UsersApiService) GetUsersExecuteWithHttpInfo(r ApiGetUsersRequest) (Use body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -648,28 +622,25 @@ func (a *UsersApiService) GetUsersIDExecuteWithHttpInfo(r ApiGetUsersIDRequest) return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -684,19 +655,19 @@ func (a *UsersApiService) GetUsersIDExecuteWithHttpInfo(r ApiGetUsersIDRequest) body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -829,28 +800,25 @@ func (a *UsersApiService) PatchUsersIDExecuteWithHttpInfo(r ApiPatchUsersIDReque return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -865,19 +833,19 @@ func (a *UsersApiService) PatchUsersIDExecuteWithHttpInfo(r ApiPatchUsersIDReque body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -998,28 +966,25 @@ func (a *UsersApiService) PostUsersExecuteWithHttpInfo(r ApiPostUsersRequest) (U return localVarReturnValue, localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { @@ -1034,19 +999,19 @@ func (a *UsersApiService) PostUsersExecuteWithHttpInfo(r ApiPostUsersRequest) (U body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarReturnValue, localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return localVarReturnValue, localVarHTTPResponse, newErr } @@ -1176,28 +1141,25 @@ func (a *UsersApiService) PostUsersIDPasswordExecuteWithHttpInfo(r ApiPostUsersI return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status var v Error err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { diff --git a/api/api_write.gen.go b/api/api_write.gen.go index a70a8d1..570db29 100644 --- a/api/api_write.gen.go +++ b/api/api_write.gen.go @@ -61,31 +61,11 @@ type WriteApi interface { * content should be achieved through the returned response model if applicable. */ PostWriteExecuteWithHttpInfo(r ApiPostWriteRequest) (*_nethttp.Response, error) - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() WriteApi - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() WriteApi } // WriteApiService WriteApi service type WriteApiService service -func (a *WriteApiService) OnlyOSS() WriteApi { - a.isOnlyOSS = true - return a -} - -func (a *WriteApiService) OnlyCloud() WriteApi { - a.isOnlyCloud = true - return a -} - type ApiPostWriteRequest struct { ctx _context.Context ApiService WriteApi @@ -313,28 +293,25 @@ func (a *WriteApiService) PostWriteExecuteWithHttpInfo(r ApiPostWriteRequest) (* return localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status if localVarHTTPResponse.StatusCode == 400 { var v LineProtocolError err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) diff --git a/api/client.gen.go b/api/client.gen.go index 5e3ae9a..b7ba972 100644 --- a/api/client.gen.go +++ b/api/client.gen.go @@ -578,16 +578,22 @@ func strlen(s string) int { } // GenericOpenAPIError Provides access to the body, error and model on returned errors. +// It also provides additional information about the HTTP response specific for the influx-cli. type GenericOpenAPIError struct { - body []byte - error string - model ApiError + body []byte + error string + model ApiError + buildHeader string } func (e GenericOpenAPIError) Body() []byte { return e.body } +func (e GenericOpenAPIError) BuildHeader() string { + return e.buildHeader +} + // Error returns non-empty string if there was an error. func (e GenericOpenAPIError) Error() string { if e.model != nil { diff --git a/api/templates/api.mustache b/api/templates/api.mustache index a20cbf1..a063285 100644 --- a/api/templates/api.mustache +++ b/api/templates/api.mustache @@ -47,32 +47,12 @@ type {{classname}} interface { */ {{nickname}}ExecuteWithHttpInfo(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{#isResponseBinary}}*_nethttp.Response{{/isResponseBinary}}{{^isResponseBinary}}{{{returnType}}}{{/isResponseBinary}}, {{/returnType}}*_nethttp.Response, error) {{/operation}} - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on OSS - // servers. - OnlyOSS() {{classname}} - - // Sets additional descriptive text in the error message if any request in - // this API fails, indicating that it is intended to be used only on cloud - // servers. - OnlyCloud() {{classname}} } {{/generateInterfaces}} // {{classname}}Service {{classname}} service type {{classname}}Service service -func (a *{{classname}}Service) OnlyOSS() {{classname}} { - a.isOnlyOSS = true - return a -} - -func (a *{{classname}}Service) OnlyCloud() {{classname}} { - a.isOnlyCloud = true - return a -} - {{#operation}} type {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request struct { @@ -378,28 +358,25 @@ func (a *{{{classname}}}Service) {{nickname}}ExecuteWithHttpInfo(r {{#structPref return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, err } - var errorPrefix string - if a.isOnlyOSS { - errorPrefix = "InfluxDB OSS-only command failed: " - } else if a.isOnlyCloud { - errorPrefix = "InfluxDB Cloud-only command failed: " - } + newErr := GenericOpenAPIError{ + buildHeader: localVarHTTPResponse.Header.Get("X-Influxdb-Build"), + } if localVarHTTPResponse.StatusCode >= 300 { body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) - } - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, localVarHTTPResponse.Status), + newErr.error = err.Error() + return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr } + newErr.body = localVarBody + newErr.error = localVarHTTPResponse.Status {{#responses}} {{#dataType}} {{^is1xx}} @@ -436,19 +413,19 @@ func (a *{{{classname}}}Service) {{nickname}}ExecuteWithHttpInfo(r {{#structPref body, err := GunzipIfNeeded(localVarHTTPResponse) if err != nil { body.Close() - return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr } localVarBody, err := _io.ReadAll(body) body.Close() if err != nil { - return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, _fmt.Errorf("%s%w", errorPrefix, err) + newErr.error = err.Error() + return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr } + newErr.body = localVarBody err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { - newErr := GenericOpenAPIError{ - body: localVarBody, - error: _fmt.Sprintf("%s%s", errorPrefix, err.Error()), - } + newErr.error = err.Error() return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr } {{/isResponseBinary}} diff --git a/api/templates/client.mustache b/api/templates/client.mustache index 73f22ec..197af33 100644 --- a/api/templates/client.mustache +++ b/api/templates/client.mustache @@ -562,16 +562,22 @@ func strlen(s string) int { } // GenericOpenAPIError Provides access to the body, error and model on returned errors. +// It also provides additional information about the HTTP response specific for the influx-cli. type GenericOpenAPIError struct { body []byte error string model ApiError + buildHeader string } func (e GenericOpenAPIError) Body() []byte { return e.body } +func (e GenericOpenAPIError) BuildHeader() string { + return e.buildHeader +} + // Error returns non-empty string if there was an error. func (e GenericOpenAPIError) Error() string { if e.model != nil { diff --git a/cmd/influx/backup.go b/cmd/influx/backup.go index d118829..dad9693 100644 --- a/cmd/influx/backup.go +++ b/cmd/influx/backup.go @@ -52,8 +52,8 @@ Examples: api := getAPI(ctx) client := backup.Client{ CLI: getCLI(ctx), - BackupApi: api.BackupApi.OnlyOSS(), - HealthApi: api.HealthApi.OnlyOSS(), + BackupApi: api.BackupApi, + HealthApi: api.HealthApi, } return client.Backup(getContext(ctx), ¶ms) }, diff --git a/cmd/influx/bucket_schema.go b/cmd/influx/bucket_schema.go index 3a58cfc..8d27fde 100644 --- a/cmd/influx/bucket_schema.go +++ b/cmd/influx/bucket_schema.go @@ -18,7 +18,7 @@ func withBucketSchemaClient() cli.BeforeFunc { client := getAPI(ctx) ctx.App.Metadata["measurement_schema"] = bucket_schema.Client{ BucketsApi: client.BucketsApi, - BucketSchemasApi: client.BucketSchemasApi.OnlyCloud(), + BucketSchemasApi: client.BucketSchemasApi, CLI: getCLI(ctx), } return nil diff --git a/cmd/influx/main.go b/cmd/influx/main.go index ca44772..5743110 100644 --- a/cmd/influx/main.go +++ b/cmd/influx/main.go @@ -24,28 +24,45 @@ func init() { cli.VersionFlag = nil } -var app = cli.App{ - Name: "influx", - Usage: "Influx Client", - UsageText: "influx [command]", - EnableBashCompletion: true, - BashComplete: cli.DefaultAppComplete, - Commands: []cli.Command{ - newVersionCmd(), +func cloudOnlyCommands() []cli.Command { + // Include commands that are only intended to work on an InfluxDB Cloud host in this list. A specific error message + // will be returned if these commands are run on an InfluxDB OSS host. + cmds := []cli.Command{ + newBucketSchemaCmd(), + } + + return middleware.AddMWToCmds(cmds, middleware.CloudOnly) +} + +func ossOnlyCommands() []cli.Command { + // Include commands that are only intended to work on an InfluxDB OSS host in this list. A specific error message will + // be returned if these commands are run on an InfluxDB Cloud host. + cmds := []cli.Command{ newPingCmd(), newSetupCmd(), + newBackupCmd(), + newRestoreCmd(), + newRemoteCmd(), + newReplicationCmd(), + newServerConfigCommand(), + } + + return middleware.AddMWToCmds(cmds, middleware.OSSOnly) +} + +func allCommands() []cli.Command { + // Commands which should work with an InfluxDB Cloud or InfluxDB OSS host should be included in this list. + commonCmds := []cli.Command{ + newVersionCmd(), newWriteCmd(), newBucketCmd(), newCompletionCmd(), - newBucketSchemaCmd(), newQueryCmd(), newConfigCmd(), newOrgCmd(), newDeleteCmd(), newUserCmd(), newTaskCommand(), - newBackupCmd(), - newRestoreCmd(), newTelegrafsCommand(), newDashboardsCommand(), newExportCmd(), @@ -55,15 +72,30 @@ var app = cli.App{ newApplyCmd(), newStacksCmd(), newTemplateCmd(), - newRemoteCmd(), - newReplicationCmd(), - newServerConfigCommand(), - }, - Before: middleware.WithBeforeFns(withContext(), middleware.NoArgs), + } + specificCmds := append(cloudOnlyCommands(), ossOnlyCommands()...) + + return append(commonCmds, specificCmds...) +} + +func newApp() cli.App { + return cli.App{ + Name: "influx", + Usage: "Influx Client", + UsageText: "influx [command]", + EnableBashCompletion: true, + BashComplete: cli.DefaultAppComplete, + Commands: allCommands(), + Before: middleware.WithBeforeFns(withContext(), middleware.NoArgs), + ExitErrHandler: middleware.HandleExit, + } } func main() { + app := newApp() if err := app.Run(os.Args); err != nil { + // Errors will normally be handled by cli.HandleExitCoder via ExitErrHandler set on app. Any error not implementing + // the cli.ExitCoder interface can be handled here. _, _ = fmt.Fprintf(os.Stderr, "Error: %v\n", err) os.Exit(1) } diff --git a/cmd/influx/main_test.go b/cmd/influx/main_test.go new file mode 100644 index 0000000..705b093 --- /dev/null +++ b/cmd/influx/main_test.go @@ -0,0 +1,159 @@ +package main + +import ( + "bytes" + "fmt" + "net/http" + "net/http/httptest" + "testing" + + "github.com/influxdata/influx-cli/v2/pkg/cli/middleware" + "github.com/stretchr/testify/require" + "github.com/urfave/cli" +) + +func TestApp_HostSpecificErrors(t *testing.T) { + tests := []struct { + name string + commandMw cli.BeforeFunc + svrBuild string + svrResCode int + wantErrString string + }{ + { + name: "OSS command on Cloud host - with error", + commandMw: middleware.OSSOnly, + svrBuild: middleware.CloudBuildHeader, + svrResCode: http.StatusServiceUnavailable, + wantErrString: fmt.Sprintf("%s\n", middleware.WrongHostErrString(middleware.OSSBuildHeader, middleware.CloudBuildHeader)), + }, + { + name: "Cloud command on OSS host - with error", + commandMw: middleware.CloudOnly, + svrBuild: middleware.OSSBuildHeader, + svrResCode: http.StatusServiceUnavailable, + wantErrString: fmt.Sprintf("%s\n", middleware.WrongHostErrString(middleware.CloudBuildHeader, middleware.OSSBuildHeader)), + }, + { + name: "OSS command on OSS host - with error", + commandMw: middleware.OSSOnly, + svrBuild: middleware.OSSBuildHeader, + svrResCode: http.StatusServiceUnavailable, + wantErrString: fmt.Sprintf("%s\n", "Error: health check failed: 503 Service Unavailable: unavailable"), + }, + { + name: "Cloud command on Cloud host - with error", + commandMw: middleware.CloudOnly, + svrBuild: middleware.CloudBuildHeader, + svrResCode: http.StatusServiceUnavailable, + wantErrString: fmt.Sprintf("%s\n", "Error: health check failed: 503 Service Unavailable: unavailable"), + }, + { + name: "OSS command on Cloud host - no error", + commandMw: middleware.OSSOnly, + svrBuild: middleware.CloudBuildHeader, + svrResCode: http.StatusOK, + wantErrString: "", + }, + { + name: "Cloud command on OSS host - no error", + commandMw: middleware.CloudOnly, + svrBuild: middleware.OSSBuildHeader, + svrResCode: http.StatusOK, + wantErrString: "", + }, + { + name: "OSS command on OSS host - no error", + commandMw: middleware.OSSOnly, + svrBuild: middleware.OSSBuildHeader, + svrResCode: http.StatusOK, + wantErrString: "", + }, + { + name: "Cloud command on Cloud host - no error", + commandMw: middleware.CloudOnly, + svrBuild: middleware.CloudBuildHeader, + svrResCode: http.StatusOK, + wantErrString: "", + }, + { + name: "Non-specific command on OSS host - with error", + commandMw: nil, + svrBuild: middleware.OSSBuildHeader, + svrResCode: http.StatusServiceUnavailable, + wantErrString: fmt.Sprintf("%s\n", "Error: health check failed: 503 Service Unavailable: unavailable"), + }, + { + name: "Non-specific command on Cloud host - with error", + commandMw: nil, + svrBuild: middleware.CloudBuildHeader, + svrResCode: http.StatusServiceUnavailable, + wantErrString: fmt.Sprintf("%s\n", "Error: health check failed: 503 Service Unavailable: unavailable"), + }, + { + name: "Non-specific command on OSS host - no error", + commandMw: nil, + svrBuild: middleware.OSSBuildHeader, + svrResCode: http.StatusOK, + wantErrString: "", + }, + { + name: "Non-specific command on Cloud host - no error", + commandMw: nil, + svrBuild: middleware.CloudBuildHeader, + svrResCode: http.StatusOK, + wantErrString: "", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + cli.OsExiter = func(code int) { + require.Equal(t, 1, code) + } + var b bytes.Buffer + errWriter := &testWriter{ + b: &b, + } + cli.ErrWriter = errWriter + + svr := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.Header().Set("X-Influxdb-Build", tt.svrBuild) + w.WriteHeader(tt.svrResCode) + _, err := fmt.Fprintf(w, `{"message":%q}`, "unavailable") + require.NoError(t, err) + })) + defer svr.Close() + cmd := newPingCmd() + if tt.commandMw != nil { + cmd = middleware.AddMWToCmds([]cli.Command{cmd}, tt.commandMw)[0] + } + app := newApp() + app.Commands = []cli.Command{cmd} + + args := []string{ + "influx", + "ping", + "--host", + svr.URL, + } + + _ = app.Run(args) + require.Equal(t, tt.wantErrString, errWriter.b.String()) + if tt.wantErrString == "" { + require.False(t, errWriter.written) + } + }) + } +} + +type testWriter struct { + b *bytes.Buffer + written bool +} + +func (w *testWriter) Write(p []byte) (int, error) { + w.written = true + return w.b.Write(p) +} diff --git a/cmd/influx/ping.go b/cmd/influx/ping.go index a298c50..d413dab 100644 --- a/cmd/influx/ping.go +++ b/cmd/influx/ping.go @@ -15,7 +15,7 @@ func newPingCmd() cli.Command { Action: func(ctx *cli.Context) error { client := ping.Client{ CLI: getCLI(ctx), - HealthApi: getAPINoToken(ctx).HealthApi.OnlyOSS(), + HealthApi: getAPINoToken(ctx).HealthApi, } return client.Ping(getContext(ctx)) }, diff --git a/cmd/influx/restore.go b/cmd/influx/restore.go index 7b429a8..b3d366a 100644 --- a/cmd/influx/restore.go +++ b/cmd/influx/restore.go @@ -87,8 +87,8 @@ Examples: api := getAPI(ctx) client := restore.Client{ CLI: getCLI(ctx), - HealthApi: api.HealthApi.OnlyOSS(), - RestoreApi: api.RestoreApi.OnlyOSS(), + HealthApi: api.HealthApi, + RestoreApi: api.RestoreApi, BucketsApi: api.BucketsApi, OrganizationsApi: api.OrganizationsApi, ApiConfig: api, diff --git a/pkg/cli/context/context.go b/pkg/cli/context/context.go new file mode 100644 index 0000000..caf0ed7 --- /dev/null +++ b/pkg/cli/context/context.go @@ -0,0 +1,26 @@ +package context + +import "github.com/urfave/cli" + +const ( + contextKeyCloudOnly = "cloudOnly" + contextKeyOssOnly = "ossOnly" +) + +func SetCloudOnly(ctx *cli.Context) { + ctx.App.Metadata[contextKeyCloudOnly] = true +} + +func SetOssOnly(ctx *cli.Context) { + ctx.App.Metadata[contextKeyOssOnly] = true +} + +func GetCloudOnly(ctx *cli.Context) bool { + _, ok := ctx.App.Metadata[contextKeyCloudOnly].(bool) + return ok +} + +func GetOssOnly(ctx *cli.Context) bool { + _, ok := ctx.App.Metadata[contextKeyOssOnly].(bool) + return ok +} diff --git a/pkg/cli/middleware/handleexit.go b/pkg/cli/middleware/handleexit.go new file mode 100644 index 0000000..f7aa56b --- /dev/null +++ b/pkg/cli/middleware/handleexit.go @@ -0,0 +1,51 @@ +package middleware + +import ( + "errors" + "fmt" + + "github.com/influxdata/influx-cli/v2/api" + icontext "github.com/influxdata/influx-cli/v2/pkg/cli/context" + "github.com/urfave/cli" +) + +const ( + OSSBuildHeader = "OSS" + CloudBuildHeader = "Cloud" +) + +func WrongHostErrString(commandHost, actualHost string) string { + return fmt.Sprintf("Error: InfluxDB %s-only command used with InfluxDB %s host", commandHost, actualHost) +} + +var HandleExit cli.ExitErrHandlerFunc = func(ctx *cli.Context, err error) { + if err == nil { + return + } + + var header string + var genericErr api.GenericOpenAPIError + if errors.As(err, &genericErr) { + header = genericErr.BuildHeader() + } + + // Replace the error message with the relevant information if a platform-specific command was used on the wrong host. + // Otherwise, pass the error message along as-is to the CLI exit handler. + var setErr bool + if header == OSSBuildHeader { + if icontext.GetCloudOnly(ctx) { + err = cli.NewExitError(WrongHostErrString(CloudBuildHeader, OSSBuildHeader), 1) + setErr = true + } + } else if header == CloudBuildHeader { + if icontext.GetOssOnly(ctx) { + err = cli.NewExitError(WrongHostErrString(OSSBuildHeader, CloudBuildHeader), 1) + setErr = true + } + } + if !setErr { + err = cli.NewExitError(fmt.Sprintf("Error: %v", err.Error()), 1) + } + + cli.HandleExitCoder(err) +} diff --git a/pkg/cli/middleware/middleware.go b/pkg/cli/middleware/middleware.go index 1402180..99d1358 100644 --- a/pkg/cli/middleware/middleware.go +++ b/pkg/cli/middleware/middleware.go @@ -1,6 +1,7 @@ package middleware import ( + icontext "github.com/influxdata/influx-cli/v2/pkg/cli/context" "github.com/urfave/cli" ) @@ -18,3 +19,25 @@ func WithBeforeFns(fns ...cli.BeforeFunc) cli.BeforeFunc { return nil } } + +// AddMWToCmds is used to append a middleware to a list of existing commands. +func AddMWToCmds(cmds []cli.Command, mw cli.BeforeFunc) []cli.Command { + newCmds := make([]cli.Command, 0, len(cmds)) + + for _, cmd := range cmds { + cmd.Before = WithBeforeFns(cmd.Before, mw) + newCmds = append(newCmds, cmd) + } + + return newCmds +} + +var CloudOnly cli.BeforeFunc = func(ctx *cli.Context) error { + icontext.SetCloudOnly(ctx) + return nil +} + +var OSSOnly cli.BeforeFunc = func(ctx *cli.Context) error { + icontext.SetOssOnly(ctx) + return nil +}