diff --git a/go.mod b/go.mod index 40007848..25808413 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( require ( github.com/conductorone/baton-sdk v0.2.35 - github.com/conductorone/conductorone-sdk-go v1.21.1-0.20241009214436-e388bb33c02f + github.com/conductorone/conductorone-sdk-go v1.22.0 github.com/pterm/pterm v0.12.62 github.com/toqueteos/webbrowser v1.2.0 github.com/xhit/go-str2duration/v2 v2.1.0 diff --git a/go.sum b/go.sum index 537737ef..80b07687 100644 --- a/go.sum +++ b/go.sum @@ -30,8 +30,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/conductorone/baton-sdk v0.2.35 h1:aSdNvlM5HMti8WdhotrXTHWs+b+BmSqMxtGwsSUFxjY= github.com/conductorone/baton-sdk v0.2.35/go.mod h1:hmd/Oz3DPIKD+9QmkusZaA18ZoiinnTDdrxh2skcdUc= -github.com/conductorone/conductorone-sdk-go v1.21.1-0.20241009214436-e388bb33c02f h1:8MMCnUzTwJegLhF/2XIP3ln+hjrEpWWX8YehtMg+m2k= -github.com/conductorone/conductorone-sdk-go v1.21.1-0.20241009214436-e388bb33c02f/go.mod h1:vr3946WqFYEpOuIGy/TqXkarhhCzHSKsmXXsxCmeIj8= +github.com/conductorone/conductorone-sdk-go v1.22.0 h1:sz9nz/85YZ0pJ/U3b63QEzE3WMSz6HuCjRTi/kb3mbU= +github.com/conductorone/conductorone-sdk-go v1.22.0/go.mod h1:vr3946WqFYEpOuIGy/TqXkarhhCzHSKsmXXsxCmeIj8= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/README.md b/vendor/github.com/conductorone/conductorone-sdk-go/README.md index 79b55133..538a332c 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/README.md +++ b/vendor/github.com/conductorone/conductorone-sdk-go/README.md @@ -17,7 +17,6 @@ ConductorOne API: The ConductorOne API is a HTTP API for managing ConductorOne r * [Server Selection](#server-selection) * [Custom HTTP Client](#custom-http-client) * [Authentication](#authentication) -* [Special Types](#special-types) @@ -104,6 +103,12 @@ func main() { * [SearchAppEntitlementsForAppUser](docs/sdks/appentitlementsearch/README.md#searchappentitlementsforappuser) - Search App Entitlements For App User * [SearchAppEntitlementsWithExpired](docs/sdks/appentitlementsearch/README.md#searchappentitlementswithexpired) - Search App Entitlements With Expired +### [AppEntitlementsProxy](docs/sdks/appentitlementsproxy/README.md) + +* [Create](docs/sdks/appentitlementsproxy/README.md#create) - Create +* [Delete](docs/sdks/appentitlementsproxy/README.md#delete) - Delete +* [Get](docs/sdks/appentitlementsproxy/README.md#get) - Get + ### [AppEntitlementUserBinding](docs/sdks/appentitlementuserbinding/README.md) * [ListAppUsersForIdentityWithGrant](docs/sdks/appentitlementuserbinding/README.md#listappusersforidentitywithgrant) - List App Users For Identity With Grant @@ -285,6 +290,7 @@ func main() { ### [SessionSettings](docs/sdks/sessionsettings/README.md) * [Get](docs/sdks/sessionsettings/README.md#get) - Get +* [TestSourceIP](docs/sdks/sessionsettings/README.md#testsourceip) - Test Source Ip * [Update](docs/sdks/sessionsettings/README.md#update) - Update ### [SystemLog](docs/sdks/systemlog/README.md) diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/RELEASES.md b/vendor/github.com/conductorone/conductorone-sdk-go/RELEASES.md index 1644baf6..c30dc651 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/RELEASES.md +++ b/vendor/github.com/conductorone/conductorone-sdk-go/RELEASES.md @@ -38,4 +38,24 @@ Based on: ### Generated - [go v1.21.0] . ### Releases -- [Go v1.21.0] https://github.com/ConductorOne/conductorone-sdk-go/releases/tag/v1.21.0 - . \ No newline at end of file +- [Go v1.21.0] https://github.com/ConductorOne/conductorone-sdk-go/releases/tag/v1.21.0 - . + +## 2024-10-17 02:26:25 +### Changes +Based on: +- OpenAPI Doc +- Speakeasy CLI 1.419.0 (2.438.3) https://github.com/speakeasy-api/speakeasy +### Generated +- [go v1.21.3] . +### Releases +- [Go v1.21.3] https://github.com/ConductorOne/conductorone-sdk-go/releases/tag/v1.21.3 - . + +## 2024-11-08 00:23:17 +### Changes +Based on: +- OpenAPI Doc +- Speakeasy CLI 1.434.6 (2.452.0) https://github.com/speakeasy-api/speakeasy +### Generated +- [go v1.22.0] . +### Releases +- [Go v1.22.0] https://github.com/ConductorOne/conductorone-sdk-go/releases/tag/v1.22.0 - . \ No newline at end of file diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appaccessrequestsdefaults.go b/vendor/github.com/conductorone/conductorone-sdk-go/appaccessrequestsdefaults.go index a5977442..a2838a25 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appaccessrequestsdefaults.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appaccessrequestsdefaults.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -173,21 +172,11 @@ func (s *AppAccessRequestsDefaults) CancelAppAccessRequestsDefaults(ctx context. RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -199,28 +188,25 @@ func (s *AppAccessRequestsDefaults) CancelAppAccessRequestsDefaults(ctx context. res.AppAccessRequestDefaults = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -375,21 +361,11 @@ func (s *AppAccessRequestsDefaults) CreateAppAccessRequestsDefaults(ctx context. RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -401,28 +377,25 @@ func (s *AppAccessRequestsDefaults) CreateAppAccessRequestsDefaults(ctx context. res.AppAccessRequestDefaults = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -571,21 +544,11 @@ func (s *AppAccessRequestsDefaults) GetAppAccessRequestsDefaults(ctx context.Con RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -597,28 +560,25 @@ func (s *AppAccessRequestsDefaults) GetAppAccessRequestsDefaults(ctx context.Con res.AppAccessRequestDefaults = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementowners.go b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementowners.go index e6707a49..e1c7050b 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementowners.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementowners.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -173,21 +172,11 @@ func (s *AppEntitlementOwners) Add(ctx context.Context, request operations.C1API RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -199,28 +188,25 @@ func (s *AppEntitlementOwners) Add(ctx context.Context, request operations.C1API res.AddAppEntitlementOwnerResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -373,21 +359,11 @@ func (s *AppEntitlementOwners) List(ctx context.Context, request operations.C1AP RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -399,28 +375,25 @@ func (s *AppEntitlementOwners) List(ctx context.Context, request operations.C1AP res.ListAppEntitlementOwnersResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -575,21 +548,11 @@ func (s *AppEntitlementOwners) Remove(ctx context.Context, request operations.C1 RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -601,28 +564,25 @@ func (s *AppEntitlementOwners) Remove(ctx context.Context, request operations.C1 res.RemoveAppEntitlementOwnerResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -777,21 +737,11 @@ func (s *AppEntitlementOwners) Set(ctx context.Context, request operations.C1API RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -803,28 +753,25 @@ func (s *AppEntitlementOwners) Set(ctx context.Context, request operations.C1API res.SetAppEntitlementOwnersResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appentitlements.go b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlements.go index f6f4dc2d..85159eac 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appentitlements.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlements.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -173,21 +172,11 @@ func (s *AppEntitlements) Create(ctx context.Context, request operations.C1APIAp RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -199,28 +188,25 @@ func (s *AppEntitlements) Create(ctx context.Context, request operations.C1APIAp res.CreateAppEntitlementResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -375,21 +361,11 @@ func (s *AppEntitlements) Delete(ctx context.Context, request operations.C1APIAp RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -401,28 +377,25 @@ func (s *AppEntitlements) Delete(ctx context.Context, request operations.C1APIAp res.DeleteAppEntitlementResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -571,21 +544,11 @@ func (s *AppEntitlements) Get(ctx context.Context, request operations.C1APIAppV1 RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -597,28 +560,25 @@ func (s *AppEntitlements) Get(ctx context.Context, request operations.C1APIAppV1 res.GetAppEntitlementResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -771,21 +731,11 @@ func (s *AppEntitlements) List(ctx context.Context, request operations.C1APIAppV RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -797,28 +747,25 @@ func (s *AppEntitlements) List(ctx context.Context, request operations.C1APIAppV res.ListAppEntitlementsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -971,21 +918,11 @@ func (s *AppEntitlements) ListForAppResource(ctx context.Context, request operat RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -997,28 +934,25 @@ func (s *AppEntitlements) ListForAppResource(ctx context.Context, request operat res.ListAppEntitlementsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1171,21 +1105,11 @@ func (s *AppEntitlements) ListForAppUser(ctx context.Context, request operations RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1197,28 +1121,25 @@ func (s *AppEntitlements) ListForAppUser(ctx context.Context, request operations res.ListAppEntitlementsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1373,21 +1294,11 @@ func (s *AppEntitlements) ListUsers(ctx context.Context, request operations.C1AP RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1399,28 +1310,25 @@ func (s *AppEntitlements) ListUsers(ctx context.Context, request operations.C1AP res.ListAppEntitlementUsersResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1575,21 +1483,11 @@ func (s *AppEntitlements) Update(ctx context.Context, request operations.C1APIAp RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1601,28 +1499,25 @@ func (s *AppEntitlements) Update(ctx context.Context, request operations.C1APIAp res.UpdateAppEntitlementResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementsearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementsearch.go index fa28308f..beef46e4 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementsearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementsearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *AppEntitlementSearch) Search(ctx context.Context, request *shared.AppEn RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *AppEntitlementSearch) Search(ctx context.Context, request *shared.AppEn res.AppEntitlementSearchServiceSearchResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -374,21 +360,11 @@ func (s *AppEntitlementSearch) SearchAppEntitlementsForAppUser(ctx context.Conte RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -400,28 +376,25 @@ func (s *AppEntitlementSearch) SearchAppEntitlementsForAppUser(ctx context.Conte res.ListAppEntitlementsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -574,21 +547,11 @@ func (s *AppEntitlementSearch) SearchAppEntitlementsWithExpired(ctx context.Cont RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -600,28 +563,25 @@ func (s *AppEntitlementSearch) SearchAppEntitlementsWithExpired(ctx context.Cont res.SearchAppEntitlementsWithExpiredResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementsproxy.go b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementsproxy.go new file mode 100644 index 00000000..9ac826d7 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementsproxy.go @@ -0,0 +1,587 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package conductoronesdkgo + +import ( + "bytes" + "context" + "fmt" + "github.com/cenkalti/backoff/v4" + "github.com/conductorone/conductorone-sdk-go/internal/hooks" + "github.com/conductorone/conductorone-sdk-go/pkg/models/operations" + "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" + "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" + "github.com/conductorone/conductorone-sdk-go/pkg/utils" + "net/http" +) + +type AppEntitlementsProxy struct { + sdkConfiguration sdkConfiguration +} + +func newAppEntitlementsProxy(sdkConfig sdkConfiguration) *AppEntitlementsProxy { + return &AppEntitlementsProxy{ + sdkConfiguration: sdkConfig, + } +} + +// Create +// Invokes the c1.api.app.v1.AppEntitlementsProxy.Create method. +func (s *AppEntitlementsProxy) Create(ctx context.Context, request operations.C1APIAppV1AppEntitlementsProxyCreateRequest, opts ...operations.Option) (*operations.C1APIAppV1AppEntitlementsProxyCreateResponse, error) { + hookCtx := hooks.HookContext{ + Context: ctx, + OperationID: "c1.api.app.v1.AppEntitlementsProxy.Create", + OAuth2Scopes: []string{}, + SecuritySource: s.sdkConfiguration.Security, + } + + o := operations.Options{} + supportedOptions := []string{ + operations.SupportedOptionRetries, + operations.SupportedOptionTimeout, + } + + for _, opt := range opts { + if err := opt(&o, supportedOptions...); err != nil { + return nil, fmt.Errorf("error applying option: %w", err) + } + } + + baseURL := utils.ReplaceParameters(s.sdkConfiguration.GetServerDetails()) + opURL, err := utils.GenerateURL(ctx, baseURL, "/api/v1/apps/{src_app_id}/{src_app_entitlement_id}/bindings/{dst_app_id}/{dst_app_entitlement_id}", request, nil) + if err != nil { + return nil, fmt.Errorf("error generating URL: %w", err) + } + + bodyReader, reqContentType, err := utils.SerializeRequestBody(ctx, request, false, true, "CreateAppEntitlementProxyRequest", "json", `request:"mediaType=application/json"`) + if err != nil { + return nil, err + } + + timeout := o.Timeout + if timeout == nil { + timeout = s.sdkConfiguration.Timeout + } + + if timeout != nil { + var cancel context.CancelFunc + ctx, cancel = context.WithTimeout(ctx, *timeout) + defer cancel() + } + + req, err := http.NewRequestWithContext(ctx, "POST", opURL, bodyReader) + if err != nil { + return nil, fmt.Errorf("error creating request: %w", err) + } + req.Header.Set("Accept", "application/json") + req.Header.Set("User-Agent", s.sdkConfiguration.UserAgent) + req.Header.Set("Content-Type", reqContentType) + + if err := utils.PopulateSecurity(ctx, req, s.sdkConfiguration.Security); err != nil { + return nil, err + } + + globalRetryConfig := s.sdkConfiguration.RetryConfig + retryConfig := o.Retries + if retryConfig == nil { + if globalRetryConfig != nil { + retryConfig = globalRetryConfig + } + } + + var httpRes *http.Response + if retryConfig != nil { + httpRes, err = utils.Retry(ctx, utils.Retries{ + Config: retryConfig, + StatusCodes: []string{ + "429", + "500", + "502", + "503", + "504", + }, + }, func() (*http.Response, error) { + if req.Body != nil { + copyBody, err := req.GetBody() + if err != nil { + return nil, err + } + req.Body = copyBody + } + + req, err = s.sdkConfiguration.Hooks.BeforeRequest(hooks.BeforeRequestContext{HookContext: hookCtx}, req) + if err != nil { + return nil, backoff.Permanent(err) + } + + httpRes, err := s.sdkConfiguration.Client.Do(req) + if err != nil || httpRes == nil { + if err != nil { + err = fmt.Errorf("error sending request: %w", err) + } else { + err = fmt.Errorf("error sending request: no response") + } + + _, err = s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, nil, err) + } + return httpRes, err + }) + + if err != nil { + return nil, err + } else { + httpRes, err = s.sdkConfiguration.Hooks.AfterSuccess(hooks.AfterSuccessContext{HookContext: hookCtx}, httpRes) + if err != nil { + return nil, err + } + } + } else { + req, err = s.sdkConfiguration.Hooks.BeforeRequest(hooks.BeforeRequestContext{HookContext: hookCtx}, req) + if err != nil { + return nil, err + } + + httpRes, err = s.sdkConfiguration.Client.Do(req) + if err != nil || httpRes == nil { + if err != nil { + err = fmt.Errorf("error sending request: %w", err) + } else { + err = fmt.Errorf("error sending request: no response") + } + + _, err = s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, nil, err) + return nil, err + } else if utils.MatchStatusCodes([]string{"4XX", "5XX"}, httpRes.StatusCode) { + _httpRes, err := s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, httpRes, nil) + if err != nil { + return nil, err + } else if _httpRes != nil { + httpRes = _httpRes + } + } else { + httpRes, err = s.sdkConfiguration.Hooks.AfterSuccess(hooks.AfterSuccessContext{HookContext: hookCtx}, httpRes) + if err != nil { + return nil, err + } + } + } + + res := &operations.C1APIAppV1AppEntitlementsProxyCreateResponse{ + StatusCode: httpRes.StatusCode, + ContentType: httpRes.Header.Get("Content-Type"), + RawResponse: httpRes, + } + + switch { + case httpRes.StatusCode == 200: + switch { + case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + + var out shared.CreateAppEntitlementProxyResponse + if err := utils.UnmarshalJsonFromResponseBody(bytes.NewBuffer(rawBody), &out, ""); err != nil { + return nil, err + } + + res.CreateAppEntitlementProxyResponse = &out + default: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) + } + case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: + fallthrough + case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) + default: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) + } + + return res, nil + +} + +// Delete +// Invokes the c1.api.app.v1.AppEntitlementsProxy.Delete method. +func (s *AppEntitlementsProxy) Delete(ctx context.Context, request operations.C1APIAppV1AppEntitlementsProxyDeleteRequest, opts ...operations.Option) (*operations.C1APIAppV1AppEntitlementsProxyDeleteResponse, error) { + hookCtx := hooks.HookContext{ + Context: ctx, + OperationID: "c1.api.app.v1.AppEntitlementsProxy.Delete", + OAuth2Scopes: []string{}, + SecuritySource: s.sdkConfiguration.Security, + } + + o := operations.Options{} + supportedOptions := []string{ + operations.SupportedOptionRetries, + operations.SupportedOptionTimeout, + } + + for _, opt := range opts { + if err := opt(&o, supportedOptions...); err != nil { + return nil, fmt.Errorf("error applying option: %w", err) + } + } + + baseURL := utils.ReplaceParameters(s.sdkConfiguration.GetServerDetails()) + opURL, err := utils.GenerateURL(ctx, baseURL, "/api/v1/apps/{src_app_id}/{src_app_entitlement_id}/bindings/{dst_app_id}/{dst_app_entitlement_id}", request, nil) + if err != nil { + return nil, fmt.Errorf("error generating URL: %w", err) + } + + bodyReader, reqContentType, err := utils.SerializeRequestBody(ctx, request, false, true, "DeleteAppEntitlementProxyRequest", "json", `request:"mediaType=application/json"`) + if err != nil { + return nil, err + } + + timeout := o.Timeout + if timeout == nil { + timeout = s.sdkConfiguration.Timeout + } + + if timeout != nil { + var cancel context.CancelFunc + ctx, cancel = context.WithTimeout(ctx, *timeout) + defer cancel() + } + + req, err := http.NewRequestWithContext(ctx, "DELETE", opURL, bodyReader) + if err != nil { + return nil, fmt.Errorf("error creating request: %w", err) + } + req.Header.Set("Accept", "application/json") + req.Header.Set("User-Agent", s.sdkConfiguration.UserAgent) + req.Header.Set("Content-Type", reqContentType) + + if err := utils.PopulateSecurity(ctx, req, s.sdkConfiguration.Security); err != nil { + return nil, err + } + + globalRetryConfig := s.sdkConfiguration.RetryConfig + retryConfig := o.Retries + if retryConfig == nil { + if globalRetryConfig != nil { + retryConfig = globalRetryConfig + } + } + + var httpRes *http.Response + if retryConfig != nil { + httpRes, err = utils.Retry(ctx, utils.Retries{ + Config: retryConfig, + StatusCodes: []string{ + "429", + "500", + "502", + "503", + "504", + }, + }, func() (*http.Response, error) { + if req.Body != nil { + copyBody, err := req.GetBody() + if err != nil { + return nil, err + } + req.Body = copyBody + } + + req, err = s.sdkConfiguration.Hooks.BeforeRequest(hooks.BeforeRequestContext{HookContext: hookCtx}, req) + if err != nil { + return nil, backoff.Permanent(err) + } + + httpRes, err := s.sdkConfiguration.Client.Do(req) + if err != nil || httpRes == nil { + if err != nil { + err = fmt.Errorf("error sending request: %w", err) + } else { + err = fmt.Errorf("error sending request: no response") + } + + _, err = s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, nil, err) + } + return httpRes, err + }) + + if err != nil { + return nil, err + } else { + httpRes, err = s.sdkConfiguration.Hooks.AfterSuccess(hooks.AfterSuccessContext{HookContext: hookCtx}, httpRes) + if err != nil { + return nil, err + } + } + } else { + req, err = s.sdkConfiguration.Hooks.BeforeRequest(hooks.BeforeRequestContext{HookContext: hookCtx}, req) + if err != nil { + return nil, err + } + + httpRes, err = s.sdkConfiguration.Client.Do(req) + if err != nil || httpRes == nil { + if err != nil { + err = fmt.Errorf("error sending request: %w", err) + } else { + err = fmt.Errorf("error sending request: no response") + } + + _, err = s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, nil, err) + return nil, err + } else if utils.MatchStatusCodes([]string{"4XX", "5XX"}, httpRes.StatusCode) { + _httpRes, err := s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, httpRes, nil) + if err != nil { + return nil, err + } else if _httpRes != nil { + httpRes = _httpRes + } + } else { + httpRes, err = s.sdkConfiguration.Hooks.AfterSuccess(hooks.AfterSuccessContext{HookContext: hookCtx}, httpRes) + if err != nil { + return nil, err + } + } + } + + res := &operations.C1APIAppV1AppEntitlementsProxyDeleteResponse{ + StatusCode: httpRes.StatusCode, + ContentType: httpRes.Header.Get("Content-Type"), + RawResponse: httpRes, + } + + switch { + case httpRes.StatusCode == 200: + switch { + case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + + var out shared.DeleteAppEntitlementProxyResponse + if err := utils.UnmarshalJsonFromResponseBody(bytes.NewBuffer(rawBody), &out, ""); err != nil { + return nil, err + } + + res.DeleteAppEntitlementProxyResponse = &out + default: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) + } + case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: + fallthrough + case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) + default: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) + } + + return res, nil + +} + +// Get +// Invokes the c1.api.app.v1.AppEntitlementsProxy.Get method. +func (s *AppEntitlementsProxy) Get(ctx context.Context, request operations.C1APIAppV1AppEntitlementsProxyGetRequest, opts ...operations.Option) (*operations.C1APIAppV1AppEntitlementsProxyGetResponse, error) { + hookCtx := hooks.HookContext{ + Context: ctx, + OperationID: "c1.api.app.v1.AppEntitlementsProxy.Get", + OAuth2Scopes: []string{}, + SecuritySource: s.sdkConfiguration.Security, + } + + o := operations.Options{} + supportedOptions := []string{ + operations.SupportedOptionRetries, + operations.SupportedOptionTimeout, + } + + for _, opt := range opts { + if err := opt(&o, supportedOptions...); err != nil { + return nil, fmt.Errorf("error applying option: %w", err) + } + } + + baseURL := utils.ReplaceParameters(s.sdkConfiguration.GetServerDetails()) + opURL, err := utils.GenerateURL(ctx, baseURL, "/api/v1/apps/{src_app_id}/{src_app_entitlement_id}/bindings/{dst_app_id}/{dst_app_entitlement_id}", request, nil) + if err != nil { + return nil, fmt.Errorf("error generating URL: %w", err) + } + + timeout := o.Timeout + if timeout == nil { + timeout = s.sdkConfiguration.Timeout + } + + if timeout != nil { + var cancel context.CancelFunc + ctx, cancel = context.WithTimeout(ctx, *timeout) + defer cancel() + } + + req, err := http.NewRequestWithContext(ctx, "GET", opURL, nil) + if err != nil { + return nil, fmt.Errorf("error creating request: %w", err) + } + req.Header.Set("Accept", "application/json") + req.Header.Set("User-Agent", s.sdkConfiguration.UserAgent) + + if err := utils.PopulateSecurity(ctx, req, s.sdkConfiguration.Security); err != nil { + return nil, err + } + + globalRetryConfig := s.sdkConfiguration.RetryConfig + retryConfig := o.Retries + if retryConfig == nil { + if globalRetryConfig != nil { + retryConfig = globalRetryConfig + } + } + + var httpRes *http.Response + if retryConfig != nil { + httpRes, err = utils.Retry(ctx, utils.Retries{ + Config: retryConfig, + StatusCodes: []string{ + "429", + "500", + "502", + "503", + "504", + }, + }, func() (*http.Response, error) { + if req.Body != nil { + copyBody, err := req.GetBody() + if err != nil { + return nil, err + } + req.Body = copyBody + } + + req, err = s.sdkConfiguration.Hooks.BeforeRequest(hooks.BeforeRequestContext{HookContext: hookCtx}, req) + if err != nil { + return nil, backoff.Permanent(err) + } + + httpRes, err := s.sdkConfiguration.Client.Do(req) + if err != nil || httpRes == nil { + if err != nil { + err = fmt.Errorf("error sending request: %w", err) + } else { + err = fmt.Errorf("error sending request: no response") + } + + _, err = s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, nil, err) + } + return httpRes, err + }) + + if err != nil { + return nil, err + } else { + httpRes, err = s.sdkConfiguration.Hooks.AfterSuccess(hooks.AfterSuccessContext{HookContext: hookCtx}, httpRes) + if err != nil { + return nil, err + } + } + } else { + req, err = s.sdkConfiguration.Hooks.BeforeRequest(hooks.BeforeRequestContext{HookContext: hookCtx}, req) + if err != nil { + return nil, err + } + + httpRes, err = s.sdkConfiguration.Client.Do(req) + if err != nil || httpRes == nil { + if err != nil { + err = fmt.Errorf("error sending request: %w", err) + } else { + err = fmt.Errorf("error sending request: no response") + } + + _, err = s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, nil, err) + return nil, err + } else if utils.MatchStatusCodes([]string{"4XX", "5XX"}, httpRes.StatusCode) { + _httpRes, err := s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, httpRes, nil) + if err != nil { + return nil, err + } else if _httpRes != nil { + httpRes = _httpRes + } + } else { + httpRes, err = s.sdkConfiguration.Hooks.AfterSuccess(hooks.AfterSuccessContext{HookContext: hookCtx}, httpRes) + if err != nil { + return nil, err + } + } + } + + res := &operations.C1APIAppV1AppEntitlementsProxyGetResponse{ + StatusCode: httpRes.StatusCode, + ContentType: httpRes.Header.Get("Content-Type"), + RawResponse: httpRes, + } + + switch { + case httpRes.StatusCode == 200: + switch { + case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + + var out shared.GetAppEntitlementProxyResponse + if err := utils.UnmarshalJsonFromResponseBody(bytes.NewBuffer(rawBody), &out, ""); err != nil { + return nil, err + } + + res.GetAppEntitlementProxyResponse = &out + default: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) + } + case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: + fallthrough + case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) + default: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) + } + + return res, nil + +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementuserbinding.go b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementuserbinding.go index b0d25210..130aa698 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementuserbinding.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appentitlementuserbinding.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -168,21 +167,11 @@ func (s *AppEntitlementUserBinding) ListAppUsersForIdentityWithGrant(ctx context RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -194,28 +183,25 @@ func (s *AppEntitlementUserBinding) ListAppUsersForIdentityWithGrant(ctx context res.ListAppUsersForIdentityWithGrantResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -364,21 +350,11 @@ func (s *AppEntitlementUserBinding) SearchGrantFeed(ctx context.Context, opts .. RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -390,28 +366,25 @@ func (s *AppEntitlementUserBinding) SearchGrantFeed(ctx context.Context, opts .. res.SearchGrantFeedResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -560,21 +533,11 @@ func (s *AppEntitlementUserBinding) SearchPastGrants(ctx context.Context, opts . RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -586,28 +549,25 @@ func (s *AppEntitlementUserBinding) SearchPastGrants(ctx context.Context, opts . res.SearchPastGrantsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appowners.go b/vendor/github.com/conductorone/conductorone-sdk-go/appowners.go index b50ef907..c7cd4453 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appowners.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appowners.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -173,21 +172,11 @@ func (s *AppOwners) Add(ctx context.Context, request operations.C1APIAppV1AppOwn RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -199,28 +188,25 @@ func (s *AppOwners) Add(ctx context.Context, request operations.C1APIAppV1AppOwn res.AddAppOwnerResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -373,21 +359,11 @@ func (s *AppOwners) List(ctx context.Context, request operations.C1APIAppV1AppOw RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -399,28 +375,25 @@ func (s *AppOwners) List(ctx context.Context, request operations.C1APIAppV1AppOw res.ListAppOwnersResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -575,21 +548,11 @@ func (s *AppOwners) Remove(ctx context.Context, request operations.C1APIAppV1App RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -601,28 +564,25 @@ func (s *AppOwners) Remove(ctx context.Context, request operations.C1APIAppV1App res.RemoveAppOwnerResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -777,21 +737,11 @@ func (s *AppOwners) Set(ctx context.Context, request operations.C1APIAppV1AppOwn RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -803,28 +753,25 @@ func (s *AppOwners) Set(ctx context.Context, request operations.C1APIAppV1AppOwn res.SetAppOwnersResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appreport.go b/vendor/github.com/conductorone/conductorone-sdk-go/appreport.go index a063d83c..46cd16eb 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appreport.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appreport.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -171,21 +170,11 @@ func (s *AppReport) List(ctx context.Context, request operations.C1APIAppV1AppRe RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -197,28 +186,25 @@ func (s *AppReport) List(ctx context.Context, request operations.C1APIAppV1AppRe res.AppReportServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appreportaction.go b/vendor/github.com/conductorone/conductorone-sdk-go/appreportaction.go index 7e9fe532..37a8cba9 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appreportaction.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appreportaction.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -173,21 +172,11 @@ func (s *AppReportAction) GenerateReport(ctx context.Context, request operations RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -199,28 +188,25 @@ func (s *AppReportAction) GenerateReport(ctx context.Context, request operations res.AppActionsServiceGenerateReportResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appresource.go b/vendor/github.com/conductorone/conductorone-sdk-go/appresource.go index 5c0f8272..b84d3cbb 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appresource.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appresource.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -173,21 +172,11 @@ func (s *AppResource) CreateManuallyManagedAppResource(ctx context.Context, requ RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -199,28 +188,25 @@ func (s *AppResource) CreateManuallyManagedAppResource(ctx context.Context, requ res.CreateManuallyManagedAppResourceResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -375,21 +361,11 @@ func (s *AppResource) DeleteManuallyManagedAppResource(ctx context.Context, requ RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -401,28 +377,25 @@ func (s *AppResource) DeleteManuallyManagedAppResource(ctx context.Context, requ res.DeleteManuallyManagedAppResourceResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -571,21 +544,11 @@ func (s *AppResource) Get(ctx context.Context, request operations.C1APIAppV1AppR RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -597,28 +560,25 @@ func (s *AppResource) Get(ctx context.Context, request operations.C1APIAppV1AppR res.AppResourceServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -771,21 +731,11 @@ func (s *AppResource) List(ctx context.Context, request operations.C1APIAppV1App RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -797,28 +747,25 @@ func (s *AppResource) List(ctx context.Context, request operations.C1APIAppV1App res.AppResourceServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -973,21 +920,11 @@ func (s *AppResource) Update(ctx context.Context, request operations.C1APIAppV1A RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -999,28 +936,25 @@ func (s *AppResource) Update(ctx context.Context, request operations.C1APIAppV1A res.AppResourceServiceUpdateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appresourceowners.go b/vendor/github.com/conductorone/conductorone-sdk-go/appresourceowners.go index 08f1764f..55f6af34 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appresourceowners.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appresourceowners.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -171,21 +170,11 @@ func (s *AppResourceOwners) List(ctx context.Context, request operations.C1APIAp RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -197,28 +186,25 @@ func (s *AppResourceOwners) List(ctx context.Context, request operations.C1APIAp res.ListAppResourceOwnersResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appresourcesearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/appresourcesearch.go index 82353b76..3311ce99 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appresourcesearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appresourcesearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *AppResourceSearch) SearchAppResourceTypes(ctx context.Context, request RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *AppResourceSearch) SearchAppResourceTypes(ctx context.Context, request res.SearchAppResourceTypesResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appresourcetype.go b/vendor/github.com/conductorone/conductorone-sdk-go/appresourcetype.go index d902db41..781c2bb1 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appresourcetype.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appresourcetype.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -173,21 +172,11 @@ func (s *AppResourceType) CreateManuallyManagedResourceType(ctx context.Context, RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -199,28 +188,25 @@ func (s *AppResourceType) CreateManuallyManagedResourceType(ctx context.Context, res.CreateManuallyManagedResourceTypeResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -375,21 +361,11 @@ func (s *AppResourceType) DeleteManuallyManagedResourceType(ctx context.Context, RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -401,28 +377,25 @@ func (s *AppResourceType) DeleteManuallyManagedResourceType(ctx context.Context, res.DeleteManuallyManagedResourceTypeResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -571,21 +544,11 @@ func (s *AppResourceType) Get(ctx context.Context, request operations.C1APIAppV1 RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -597,28 +560,25 @@ func (s *AppResourceType) Get(ctx context.Context, request operations.C1APIAppV1 res.AppResourceTypeServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -771,21 +731,11 @@ func (s *AppResourceType) List(ctx context.Context, request operations.C1APIAppV RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -797,28 +747,25 @@ func (s *AppResourceType) List(ctx context.Context, request operations.C1APIAppV res.AppResourceTypeServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -973,21 +920,11 @@ func (s *AppResourceType) UpdateManuallyManagedResourceType(ctx context.Context, RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -999,28 +936,25 @@ func (s *AppResourceType) UpdateManuallyManagedResourceType(ctx context.Context, res.UpdateManuallyManagedResourceTypeResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/apps.go b/vendor/github.com/conductorone/conductorone-sdk-go/apps.go index 5bc65461..5282e83c 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/apps.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/apps.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *Apps) Create(ctx context.Context, request *shared.CreateAppRequest, opt RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *Apps) Create(ctx context.Context, request *shared.CreateAppRequest, opt res.CreateAppResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -376,21 +362,11 @@ func (s *Apps) Delete(ctx context.Context, request operations.C1APIAppV1AppsDele RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -402,28 +378,25 @@ func (s *Apps) Delete(ctx context.Context, request operations.C1APIAppV1AppsDele res.DeleteAppResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -572,21 +545,11 @@ func (s *Apps) Get(ctx context.Context, request operations.C1APIAppV1AppsGetRequ RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -598,28 +561,25 @@ func (s *Apps) Get(ctx context.Context, request operations.C1APIAppV1AppsGetRequ res.GetAppResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -772,21 +732,11 @@ func (s *Apps) List(ctx context.Context, request operations.C1APIAppV1AppsListRe RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -798,28 +748,25 @@ func (s *Apps) List(ctx context.Context, request operations.C1APIAppV1AppsListRe res.ListAppsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -974,21 +921,11 @@ func (s *Apps) Update(ctx context.Context, request operations.C1APIAppV1AppsUpda RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1000,28 +937,25 @@ func (s *Apps) Update(ctx context.Context, request operations.C1APIAppV1AppsUpda res.UpdateAppResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appsearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/appsearch.go index 7746ce71..84b9168f 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appsearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appsearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *AppSearch) Search(ctx context.Context, request *shared.SearchAppsReques RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *AppSearch) Search(ctx context.Context, request *shared.SearchAppsReques res.SearchAppsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appusagecontrols.go b/vendor/github.com/conductorone/conductorone-sdk-go/appusagecontrols.go index 1e42c0c6..ffdec079 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appusagecontrols.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appusagecontrols.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -167,21 +166,11 @@ func (s *AppUsageControls) Get(ctx context.Context, request operations.C1APIAppV RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -193,28 +182,25 @@ func (s *AppUsageControls) Get(ctx context.Context, request operations.C1APIAppV res.GetAppUsageControlsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -369,21 +355,11 @@ func (s *AppUsageControls) Update(ctx context.Context, request operations.C1APIA RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -395,28 +371,25 @@ func (s *AppUsageControls) Update(ctx context.Context, request operations.C1APIA res.UpdateAppUsageControlsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/appuser.go b/vendor/github.com/conductorone/conductorone-sdk-go/appuser.go index d46c2a96..21e18569 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/appuser.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/appuser.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -167,21 +166,11 @@ func (s *AppUser) List(ctx context.Context, request operations.C1APIAppV1AppUser RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -193,28 +182,25 @@ func (s *AppUser) List(ctx context.Context, request operations.C1APIAppV1AppUser res.AppUserServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -363,21 +349,11 @@ func (s *AppUser) ListAppUserCredentials(ctx context.Context, request operations RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -389,28 +365,25 @@ func (s *AppUser) ListAppUserCredentials(ctx context.Context, request operations res.AppUserServiceListCredentialsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -567,21 +540,11 @@ func (s *AppUser) Update(ctx context.Context, request operations.C1APIAppV1AppUs RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -593,28 +556,25 @@ func (s *AppUser) Update(ctx context.Context, request operations.C1APIAppV1AppUs res.AppUserServiceUpdateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/attributes.go b/vendor/github.com/conductorone/conductorone-sdk-go/attributes.go index 5f8d2967..d4870ac2 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/attributes.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/attributes.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *Attributes) CreateAttributeValue(ctx context.Context, request *shared.C RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *Attributes) CreateAttributeValue(ctx context.Context, request *shared.C res.CreateAttributeValueResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -376,21 +362,11 @@ func (s *Attributes) DeleteAttributeValue(ctx context.Context, request operation RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -402,28 +378,25 @@ func (s *Attributes) DeleteAttributeValue(ctx context.Context, request operation res.DeleteAttributeValueResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -572,21 +545,11 @@ func (s *Attributes) GetAttributeValue(ctx context.Context, request operations.C RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -598,28 +561,25 @@ func (s *Attributes) GetAttributeValue(ctx context.Context, request operations.C res.GetAttributeValueResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -772,21 +732,11 @@ func (s *Attributes) ListAttributeTypes(ctx context.Context, request operations. RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -798,28 +748,25 @@ func (s *Attributes) ListAttributeTypes(ctx context.Context, request operations. res.ListAttributeTypesResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -972,21 +919,11 @@ func (s *Attributes) ListAttributeValues(ctx context.Context, request operations RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -998,28 +935,25 @@ func (s *Attributes) ListAttributeValues(ctx context.Context, request operations res.ListAttributeValuesResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/attributesearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/attributesearch.go index d083a45e..aa28d02e 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/attributesearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/attributesearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *AttributeSearch) SearchAttributeValues(ctx context.Context, request *sh RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *AttributeSearch) SearchAttributeValues(ctx context.Context, request *sh res.SearchAttributeValuesResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/auth.go b/vendor/github.com/conductorone/conductorone-sdk-go/auth.go index 7482404a..ebaa563c 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/auth.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/auth.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -168,21 +167,11 @@ func (s *Auth) Introspect(ctx context.Context, opts ...operations.Option) (*oper RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -194,28 +183,25 @@ func (s *Auth) Introspect(ctx context.Context, opts ...operations.Option) (*oper res.IntrospectResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/awsexternalidsettings.go b/vendor/github.com/conductorone/conductorone-sdk-go/awsexternalidsettings.go index c49eaeca..ac32e9e6 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/awsexternalidsettings.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/awsexternalidsettings.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -168,21 +167,11 @@ func (s *AWSExternalIDSettings) Get(ctx context.Context, opts ...operations.Opti RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -194,28 +183,25 @@ func (s *AWSExternalIDSettings) Get(ctx context.Context, opts ...operations.Opti res.GetAWSExternalIDResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/conductoroneapi.go b/vendor/github.com/conductorone/conductorone-sdk-go/conductoroneapi.go index 4bce3691..b7e46b0e 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/conductoroneapi.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/conductoroneapi.go @@ -16,7 +16,7 @@ import ( // ServerList contains the list of servers available to the SDK var ServerList = []string{ // The ConductorOne API server for the current tenant. - "https://{tenantDomain}.logan.d2.ductone.com:2443", + "https://{tenantDomain}.conductor.one", } // HTTPClient provides an interface for suplying the SDK with a custom HTTP client @@ -86,6 +86,7 @@ type ConductoroneAPI struct { AppResource *AppResource AppResourceOwners *AppResourceOwners AppUsageControls *AppUsageControls + AppEntitlementsProxy *AppEntitlementsProxy Attributes *Attributes Auth *Auth RequestCatalogManagement *RequestCatalogManagement @@ -202,9 +203,9 @@ func New(opts ...SDKOption) *ConductoroneAPI { sdkConfiguration: sdkConfiguration{ Language: "go", OpenAPIDocVersion: "0.1.0-alpha", - SDKVersion: "1.21.1", - GenVersion: "2.428.1", - UserAgent: "speakeasy-sdk/go 1.21.1 2.428.1 0.1.0-alpha github.com/conductorone/conductorone-sdk-go", + SDKVersion: "1.22.0", + GenVersion: "2.452.0", + UserAgent: "speakeasy-sdk/go 1.22.0 2.452.0 0.1.0-alpha github.com/conductorone/conductorone-sdk-go", ServerDefaults: []map[string]string{ { "tenantDomain": "example", @@ -259,6 +260,8 @@ func New(opts ...SDKOption) *ConductoroneAPI { sdk.AppUsageControls = newAppUsageControls(sdk.sdkConfiguration) + sdk.AppEntitlementsProxy = newAppEntitlementsProxy(sdk.sdkConfiguration) + sdk.Attributes = newAttributes(sdk.sdkConfiguration) sdk.Auth = newAuth(sdk.sdkConfiguration) diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/connector.go b/vendor/github.com/conductorone/conductorone-sdk-go/connector.go index 3c4dea7b..c36b8fa6 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/connector.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/connector.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -173,21 +172,11 @@ func (s *Connector) Create(ctx context.Context, request operations.C1APIAppV1Con RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -199,28 +188,25 @@ func (s *Connector) Create(ctx context.Context, request operations.C1APIAppV1Con res.ConnectorServiceCreateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -375,21 +361,11 @@ func (s *Connector) CreateDelegated(ctx context.Context, request operations.C1AP RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -401,28 +377,25 @@ func (s *Connector) CreateDelegated(ctx context.Context, request operations.C1AP res.ConnectorServiceCreateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -577,21 +550,11 @@ func (s *Connector) Delete(ctx context.Context, request operations.C1APIAppV1Con RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -603,28 +566,25 @@ func (s *Connector) Delete(ctx context.Context, request operations.C1APIAppV1Con res.ConnectorServiceDeleteResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -779,21 +739,11 @@ func (s *Connector) ForceSync(ctx context.Context, request operations.C1APIAppV1 RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -805,28 +755,25 @@ func (s *Connector) ForceSync(ctx context.Context, request operations.C1APIAppV1 res.ForceSyncResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -975,21 +922,11 @@ func (s *Connector) Get(ctx context.Context, request operations.C1APIAppV1Connec RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1001,28 +938,25 @@ func (s *Connector) Get(ctx context.Context, request operations.C1APIAppV1Connec res.ConnectorServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1171,21 +1105,11 @@ func (s *Connector) GetCredentials(ctx context.Context, request operations.C1API RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1197,28 +1121,25 @@ func (s *Connector) GetCredentials(ctx context.Context, request operations.C1API res.ConnectorServiceGetCredentialsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1371,21 +1292,11 @@ func (s *Connector) List(ctx context.Context, request operations.C1APIAppV1Conne RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1397,28 +1308,25 @@ func (s *Connector) List(ctx context.Context, request operations.C1APIAppV1Conne res.ConnectorServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1573,21 +1481,11 @@ func (s *Connector) RevokeCredential(ctx context.Context, request operations.C1A RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1599,28 +1497,25 @@ func (s *Connector) RevokeCredential(ctx context.Context, request operations.C1A res.ConnectorServiceRevokeCredentialResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1775,21 +1670,11 @@ func (s *Connector) RotateCredential(ctx context.Context, request operations.C1A RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1801,28 +1686,25 @@ func (s *Connector) RotateCredential(ctx context.Context, request operations.C1A res.ConnectorServiceRotateCredentialResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1977,21 +1859,11 @@ func (s *Connector) Update(ctx context.Context, request operations.C1APIAppV1Con RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -2003,28 +1875,25 @@ func (s *Connector) Update(ctx context.Context, request operations.C1APIAppV1Con res.ConnectorServiceUpdateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -2179,21 +2048,11 @@ func (s *Connector) UpdateDelegated(ctx context.Context, request operations.C1AP RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -2205,28 +2064,25 @@ func (s *Connector) UpdateDelegated(ctx context.Context, request operations.C1AP res.ConnectorServiceUpdateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/directory.go b/vendor/github.com/conductorone/conductorone-sdk-go/directory.go index b6452278..f864f720 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/directory.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/directory.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *Directory) Create(ctx context.Context, request *shared.DirectoryService RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *Directory) Create(ctx context.Context, request *shared.DirectoryService res.DirectoryServiceCreateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -376,21 +362,11 @@ func (s *Directory) Delete(ctx context.Context, request operations.C1APIDirector RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -402,28 +378,25 @@ func (s *Directory) Delete(ctx context.Context, request operations.C1APIDirector res.DirectoryServiceDeleteResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -572,21 +545,11 @@ func (s *Directory) Get(ctx context.Context, request operations.C1APIDirectoryV1 RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -598,28 +561,25 @@ func (s *Directory) Get(ctx context.Context, request operations.C1APIDirectoryV1 res.DirectoryServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -772,21 +732,11 @@ func (s *Directory) List(ctx context.Context, request operations.C1APIDirectoryV RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -798,28 +748,25 @@ func (s *Directory) List(ctx context.Context, request operations.C1APIDirectoryV res.DirectoryServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/export.go b/vendor/github.com/conductorone/conductorone-sdk-go/export.go index 14c6bce9..9561ec9e 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/export.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/export.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *Export) Create(ctx context.Context, request *shared.ExportServiceCreate RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *Export) Create(ctx context.Context, request *shared.ExportServiceCreate res.ExportServiceCreateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -376,21 +362,11 @@ func (s *Export) Delete(ctx context.Context, request operations.C1APISystemlogV1 RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -402,28 +378,25 @@ func (s *Export) Delete(ctx context.Context, request operations.C1APISystemlogV1 res.ExportServiceDeleteResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -572,21 +545,11 @@ func (s *Export) Get(ctx context.Context, request operations.C1APISystemlogV1Exp RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -598,28 +561,25 @@ func (s *Export) Get(ctx context.Context, request operations.C1APISystemlogV1Exp res.ExportServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -772,21 +732,11 @@ func (s *Export) List(ctx context.Context, request operations.C1APISystemlogV1Ex RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -798,28 +748,25 @@ func (s *Export) List(ctx context.Context, request operations.C1APISystemlogV1Ex res.ExportServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -974,21 +921,11 @@ func (s *Export) ListEvents(ctx context.Context, request operations.C1APISysteml RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1000,28 +937,25 @@ func (s *Export) ListEvents(ctx context.Context, request operations.C1APISysteml res.ExportServiceListEventsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1176,21 +1110,11 @@ func (s *Export) Update(ctx context.Context, request operations.C1APISystemlogV1 RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1202,28 +1126,25 @@ func (s *Export) Update(ctx context.Context, request operations.C1APISystemlogV1 res.ExportServiceUpdateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/exportssearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/exportssearch.go index a423a290..8a25ed7c 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/exportssearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/exportssearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *ExportsSearch) Search(ctx context.Context, request *shared.ExportsSearc RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *ExportsSearch) Search(ctx context.Context, request *shared.ExportsSearc res.ExportsSearchServiceSearchResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/gen.yaml b/vendor/github.com/conductorone/conductorone-sdk-go/gen.yaml index 812aa1fa..6d543ffe 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/gen.yaml +++ b/vendor/github.com/conductorone/conductorone-sdk-go/gen.yaml @@ -9,8 +9,9 @@ generation: requestResponseComponentNamesFeb2024: false auth: oAuth2ClientCredentialsEnabled: false + oAuth2PasswordEnabled: false go: - version: 1.21.1 + version: 1.22.0 additionalDependencies: {} allowUnknownFieldsInWeakUnions: false clientServerStatusCodesAsErrors: true diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/personalclient.go b/vendor/github.com/conductorone/conductorone-sdk-go/personalclient.go index 7c065dbe..e8046793 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/personalclient.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/personalclient.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *PersonalClient) Create(ctx context.Context, request *shared.PersonalCli RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *PersonalClient) Create(ctx context.Context, request *shared.PersonalCli res.PersonalClientServiceCreateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -376,21 +362,11 @@ func (s *PersonalClient) Delete(ctx context.Context, request operations.C1APIIam RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -402,28 +378,25 @@ func (s *PersonalClient) Delete(ctx context.Context, request operations.C1APIIam res.PersonalClientServiceDeleteResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -572,21 +545,11 @@ func (s *PersonalClient) Get(ctx context.Context, request operations.C1APIIamV1P RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -598,28 +561,25 @@ func (s *PersonalClient) Get(ctx context.Context, request operations.C1APIIamV1P res.PersonalClientServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -768,21 +728,11 @@ func (s *PersonalClient) List(ctx context.Context, opts ...operations.Option) (* RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -794,28 +744,25 @@ func (s *PersonalClient) List(ctx context.Context, opts ...operations.Option) (* res.PersonalClientServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -970,21 +917,11 @@ func (s *PersonalClient) Update(ctx context.Context, request operations.C1APIIam RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -996,28 +933,25 @@ func (s *PersonalClient) Update(ctx context.Context, request operations.C1APIIam res.PersonalClientServiceUpdateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/personalclientsearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/personalclientsearch.go index 905eb036..2d9beaf3 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/personalclientsearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/personalclientsearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *PersonalClientSearch) Search(ctx context.Context, request *shared.Perso RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *PersonalClientSearch) Search(ctx context.Context, request *shared.Perso res.PersonalClientSearchServiceSearchResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apiappv1appentitlementsproxycreate.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apiappv1appentitlementsproxycreate.go new file mode 100644 index 00000000..65c51af2 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apiappv1appentitlementsproxycreate.go @@ -0,0 +1,90 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package operations + +import ( + "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" + "net/http" +) + +type C1APIAppV1AppEntitlementsProxyCreateRequest struct { + CreateAppEntitlementProxyRequest *shared.CreateAppEntitlementProxyRequest `request:"mediaType=application/json"` + DstAppEntitlementID string `pathParam:"style=simple,explode=false,name=dst_app_entitlement_id"` + DstAppID string `pathParam:"style=simple,explode=false,name=dst_app_id"` + SrcAppEntitlementID string `pathParam:"style=simple,explode=false,name=src_app_entitlement_id"` + SrcAppID string `pathParam:"style=simple,explode=false,name=src_app_id"` +} + +func (o *C1APIAppV1AppEntitlementsProxyCreateRequest) GetCreateAppEntitlementProxyRequest() *shared.CreateAppEntitlementProxyRequest { + if o == nil { + return nil + } + return o.CreateAppEntitlementProxyRequest +} + +func (o *C1APIAppV1AppEntitlementsProxyCreateRequest) GetDstAppEntitlementID() string { + if o == nil { + return "" + } + return o.DstAppEntitlementID +} + +func (o *C1APIAppV1AppEntitlementsProxyCreateRequest) GetDstAppID() string { + if o == nil { + return "" + } + return o.DstAppID +} + +func (o *C1APIAppV1AppEntitlementsProxyCreateRequest) GetSrcAppEntitlementID() string { + if o == nil { + return "" + } + return o.SrcAppEntitlementID +} + +func (o *C1APIAppV1AppEntitlementsProxyCreateRequest) GetSrcAppID() string { + if o == nil { + return "" + } + return o.SrcAppID +} + +type C1APIAppV1AppEntitlementsProxyCreateResponse struct { + // HTTP response content type for this operation + ContentType string + // Successful response + CreateAppEntitlementProxyResponse *shared.CreateAppEntitlementProxyResponse + // HTTP response status code for this operation + StatusCode int + // Raw HTTP response; suitable for custom response parsing + RawResponse *http.Response +} + +func (o *C1APIAppV1AppEntitlementsProxyCreateResponse) GetContentType() string { + if o == nil { + return "" + } + return o.ContentType +} + +func (o *C1APIAppV1AppEntitlementsProxyCreateResponse) GetCreateAppEntitlementProxyResponse() *shared.CreateAppEntitlementProxyResponse { + if o == nil { + return nil + } + return o.CreateAppEntitlementProxyResponse +} + +func (o *C1APIAppV1AppEntitlementsProxyCreateResponse) GetStatusCode() int { + if o == nil { + return 0 + } + return o.StatusCode +} + +func (o *C1APIAppV1AppEntitlementsProxyCreateResponse) GetRawResponse() *http.Response { + if o == nil { + return nil + } + return o.RawResponse +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apiappv1appentitlementsproxydelete.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apiappv1appentitlementsproxydelete.go new file mode 100644 index 00000000..be40da31 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apiappv1appentitlementsproxydelete.go @@ -0,0 +1,90 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package operations + +import ( + "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" + "net/http" +) + +type C1APIAppV1AppEntitlementsProxyDeleteRequest struct { + DeleteAppEntitlementProxyRequest *shared.DeleteAppEntitlementProxyRequest `request:"mediaType=application/json"` + DstAppEntitlementID string `pathParam:"style=simple,explode=false,name=dst_app_entitlement_id"` + DstAppID string `pathParam:"style=simple,explode=false,name=dst_app_id"` + SrcAppEntitlementID string `pathParam:"style=simple,explode=false,name=src_app_entitlement_id"` + SrcAppID string `pathParam:"style=simple,explode=false,name=src_app_id"` +} + +func (o *C1APIAppV1AppEntitlementsProxyDeleteRequest) GetDeleteAppEntitlementProxyRequest() *shared.DeleteAppEntitlementProxyRequest { + if o == nil { + return nil + } + return o.DeleteAppEntitlementProxyRequest +} + +func (o *C1APIAppV1AppEntitlementsProxyDeleteRequest) GetDstAppEntitlementID() string { + if o == nil { + return "" + } + return o.DstAppEntitlementID +} + +func (o *C1APIAppV1AppEntitlementsProxyDeleteRequest) GetDstAppID() string { + if o == nil { + return "" + } + return o.DstAppID +} + +func (o *C1APIAppV1AppEntitlementsProxyDeleteRequest) GetSrcAppEntitlementID() string { + if o == nil { + return "" + } + return o.SrcAppEntitlementID +} + +func (o *C1APIAppV1AppEntitlementsProxyDeleteRequest) GetSrcAppID() string { + if o == nil { + return "" + } + return o.SrcAppID +} + +type C1APIAppV1AppEntitlementsProxyDeleteResponse struct { + // HTTP response content type for this operation + ContentType string + // Successful response + DeleteAppEntitlementProxyResponse *shared.DeleteAppEntitlementProxyResponse + // HTTP response status code for this operation + StatusCode int + // Raw HTTP response; suitable for custom response parsing + RawResponse *http.Response +} + +func (o *C1APIAppV1AppEntitlementsProxyDeleteResponse) GetContentType() string { + if o == nil { + return "" + } + return o.ContentType +} + +func (o *C1APIAppV1AppEntitlementsProxyDeleteResponse) GetDeleteAppEntitlementProxyResponse() *shared.DeleteAppEntitlementProxyResponse { + if o == nil { + return nil + } + return o.DeleteAppEntitlementProxyResponse +} + +func (o *C1APIAppV1AppEntitlementsProxyDeleteResponse) GetStatusCode() int { + if o == nil { + return 0 + } + return o.StatusCode +} + +func (o *C1APIAppV1AppEntitlementsProxyDeleteResponse) GetRawResponse() *http.Response { + if o == nil { + return nil + } + return o.RawResponse +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apiappv1appentitlementsproxyget.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apiappv1appentitlementsproxyget.go new file mode 100644 index 00000000..25d6ca62 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apiappv1appentitlementsproxyget.go @@ -0,0 +1,82 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package operations + +import ( + "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" + "net/http" +) + +type C1APIAppV1AppEntitlementsProxyGetRequest struct { + DstAppEntitlementID string `pathParam:"style=simple,explode=false,name=dst_app_entitlement_id"` + DstAppID string `pathParam:"style=simple,explode=false,name=dst_app_id"` + SrcAppEntitlementID string `pathParam:"style=simple,explode=false,name=src_app_entitlement_id"` + SrcAppID string `pathParam:"style=simple,explode=false,name=src_app_id"` +} + +func (o *C1APIAppV1AppEntitlementsProxyGetRequest) GetDstAppEntitlementID() string { + if o == nil { + return "" + } + return o.DstAppEntitlementID +} + +func (o *C1APIAppV1AppEntitlementsProxyGetRequest) GetDstAppID() string { + if o == nil { + return "" + } + return o.DstAppID +} + +func (o *C1APIAppV1AppEntitlementsProxyGetRequest) GetSrcAppEntitlementID() string { + if o == nil { + return "" + } + return o.SrcAppEntitlementID +} + +func (o *C1APIAppV1AppEntitlementsProxyGetRequest) GetSrcAppID() string { + if o == nil { + return "" + } + return o.SrcAppID +} + +type C1APIAppV1AppEntitlementsProxyGetResponse struct { + // HTTP response content type for this operation + ContentType string + // Successful response + GetAppEntitlementProxyResponse *shared.GetAppEntitlementProxyResponse + // HTTP response status code for this operation + StatusCode int + // Raw HTTP response; suitable for custom response parsing + RawResponse *http.Response +} + +func (o *C1APIAppV1AppEntitlementsProxyGetResponse) GetContentType() string { + if o == nil { + return "" + } + return o.ContentType +} + +func (o *C1APIAppV1AppEntitlementsProxyGetResponse) GetGetAppEntitlementProxyResponse() *shared.GetAppEntitlementProxyResponse { + if o == nil { + return nil + } + return o.GetAppEntitlementProxyResponse +} + +func (o *C1APIAppV1AppEntitlementsProxyGetResponse) GetStatusCode() int { + if o == nil { + return 0 + } + return o.StatusCode +} + +func (o *C1APIAppV1AppEntitlementsProxyGetResponse) GetRawResponse() *http.Response { + if o == nil { + return nil + } + return o.RawResponse +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apisettingsv1sessionsettingsservicetestsourceip.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apisettingsv1sessionsettingsservicetestsourceip.go new file mode 100644 index 00000000..23f71eaf --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/operations/c1apisettingsv1sessionsettingsservicetestsourceip.go @@ -0,0 +1,47 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package operations + +import ( + "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" + "net/http" +) + +type C1APISettingsV1SessionSettingsServiceTestSourceIPResponse struct { + // HTTP response content type for this operation + ContentType string + // HTTP response status code for this operation + StatusCode int + // Raw HTTP response; suitable for custom response parsing + RawResponse *http.Response + // Successful response + TestSourceIPResponse *shared.TestSourceIPResponse +} + +func (o *C1APISettingsV1SessionSettingsServiceTestSourceIPResponse) GetContentType() string { + if o == nil { + return "" + } + return o.ContentType +} + +func (o *C1APISettingsV1SessionSettingsServiceTestSourceIPResponse) GetStatusCode() int { + if o == nil { + return 0 + } + return o.StatusCode +} + +func (o *C1APISettingsV1SessionSettingsServiceTestSourceIPResponse) GetRawResponse() *http.Response { + if o == nil { + return nil + } + return o.RawResponse +} + +func (o *C1APISettingsV1SessionSettingsServiceTestSourceIPResponse) GetTestSourceIPResponse() *shared.TestSourceIPResponse { + if o == nil { + return nil + } + return o.TestSourceIPResponse +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/app.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/app.go index e2043d82..6642c524 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/app.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/app.go @@ -47,6 +47,8 @@ type App struct { IdentityMatching *IdentityMatching `json:"identityMatching,omitempty"` // Specifies if the app is a directory. IsDirectory *bool `json:"isDirectory,omitempty"` + // The isManuallyManaged field. + IsManuallyManaged *bool `json:"isManuallyManaged,omitempty"` // The URL of a logo to display for the app. LogoURI *string `json:"logoUri,omitempty"` // The cost of an app per-seat, so that total cost can be calculated by the grant count. @@ -169,6 +171,13 @@ func (o *App) GetIsDirectory() *bool { return o.IsDirectory } +func (o *App) GetIsManuallyManaged() *bool { + if o == nil { + return nil + } + return o.IsManuallyManaged +} + func (o *App) GetLogoURI() *string { if o == nil { return nil @@ -225,6 +234,8 @@ type AppInput struct { IconURL *string `json:"iconUrl,omitempty"` // The identityMatching field. IdentityMatching *IdentityMatching `json:"identityMatching,omitempty"` + // The isManuallyManaged field. + IsManuallyManaged *bool `json:"isManuallyManaged,omitempty"` // The cost of an app per-seat, so that total cost can be calculated by the grant count. MonthlyCostUsd *int `json:"monthlyCostUsd,omitempty"` // The ID of the Revoke Policy associated with this App. @@ -273,6 +284,13 @@ func (o *AppInput) GetIdentityMatching() *IdentityMatching { return o.IdentityMatching } +func (o *AppInput) GetIsManuallyManaged() *bool { + if o == nil { + return nil + } + return o.IsManuallyManaged +} + func (o *AppInput) GetMonthlyCostUsd() *int { if o == nil { return nil diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlement.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlement.go index a653c3aa..f7af5eb6 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlement.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlement.go @@ -10,6 +10,19 @@ import ( type AppEntitlementDurationUnset struct { } +// Purpose - The purpose field. +type Purpose string + +const ( + PurposeAppEntitlementPurposeValueUnspecified Purpose = "APP_ENTITLEMENT_PURPOSE_VALUE_UNSPECIFIED" + PurposeAppEntitlementPurposeValueAssignment Purpose = "APP_ENTITLEMENT_PURPOSE_VALUE_ASSIGNMENT" + PurposeAppEntitlementPurposeValuePermission Purpose = "APP_ENTITLEMENT_PURPOSE_VALUE_PERMISSION" +) + +func (e Purpose) ToPointer() *Purpose { + return &e +} + // AppEntitlement - The app entitlement represents one permission in a downstream App (SAAS) that can be granted. For example, GitHub Read vs GitHub Write. // // This message contains a oneof named max_grant_duration. Only a single field of the following list may be set at a time: @@ -65,6 +78,8 @@ type AppEntitlement struct { IsManuallyManaged *bool `json:"isManuallyManaged,omitempty"` // Flag to indicate if the app-level access request settings have been overridden for the entitlement OverrideAccessRequestsDefaults *bool `json:"overrideAccessRequestsDefaults,omitempty"` + // The purpose field. + Purpose *Purpose `json:"purpose,omitempty"` // The ID of the policy that will be used for revoke tickets related to the app entitlement RevokePolicyID *string `json:"revokePolicyId,omitempty"` // The riskLevelValueId field. @@ -244,6 +259,13 @@ func (o *AppEntitlement) GetOverrideAccessRequestsDefaults() *bool { return o.OverrideAccessRequestsDefaults } +func (o *AppEntitlement) GetPurpose() *Purpose { + if o == nil { + return nil + } + return o.Purpose +} + func (o *AppEntitlement) GetRevokePolicyID() *string { if o == nil { return nil @@ -310,6 +332,8 @@ type AppEntitlementInput struct { // - externalTicket // ProvisionPolicy *ProvisionPolicyInput `json:"provisionerPolicy,omitempty"` + // The alias of the app entitlement used by Cone. Also exact-match queryable. + Alias *string `json:"alias,omitempty"` // The ID of the app that is associated with the app entitlement. AppID *string `json:"appId,omitempty"` // The ID of the app resource that is associated with the app entitlement @@ -338,6 +362,8 @@ type AppEntitlementInput struct { IsManuallyManaged *bool `json:"isManuallyManaged,omitempty"` // Flag to indicate if the app-level access request settings have been overridden for the entitlement OverrideAccessRequestsDefaults *bool `json:"overrideAccessRequestsDefaults,omitempty"` + // The purpose field. + Purpose *Purpose `json:"purpose,omitempty"` // The ID of the policy that will be used for revoke tickets related to the app entitlement RevokePolicyID *string `json:"revokePolicyId,omitempty"` // The riskLevelValueId field. @@ -356,6 +382,13 @@ func (o *AppEntitlementInput) GetProvisionPolicy() *ProvisionPolicyInput { return o.ProvisionPolicy } +func (o *AppEntitlementInput) GetAlias() *string { + if o == nil { + return nil + } + return o.Alias +} + func (o *AppEntitlementInput) GetAppID() *string { if o == nil { return nil @@ -461,238 +494,42 @@ func (o *AppEntitlementInput) GetOverrideAccessRequestsDefaults() *bool { return o.OverrideAccessRequestsDefaults } -func (o *AppEntitlementInput) GetRevokePolicyID() *string { - if o == nil { - return nil - } - return o.RevokePolicyID -} - -func (o *AppEntitlementInput) GetRiskLevelValueID() *string { +func (o *AppEntitlementInput) GetPurpose() *Purpose { if o == nil { return nil } - return o.RiskLevelValueID -} - -func (o *AppEntitlementInput) GetSlug() *string { - if o == nil { - return nil - } - return o.Slug -} - -func (o *AppEntitlementInput) GetSourceConnectorIds() map[string]string { - if o == nil { - return nil - } - return o.SourceConnectorIds -} - -func (o *AppEntitlementInput) GetUserEditedMask() *string { - if o == nil { - return nil - } - return o.UserEditedMask -} - -// AppEntitlementInput1 - The app entitlement represents one permission in a downstream App (SAAS) that can be granted. For example, GitHub Read vs GitHub Write. -// -// This message contains a oneof named max_grant_duration. Only a single field of the following list may be set at a time: -// - durationUnset -// - durationGrant -type AppEntitlementInput1 struct { - // ProvisionPolicy is a oneOf that indicates how a provision step should be processed. - // - // This message contains a oneof named typ. Only a single field of the following list may be set at a time: - // - connector - // - manual - // - delegated - // - webhook - // - multiStep - // - externalTicket - // - ProvisionPolicy *ProvisionPolicyInput `json:"provisionerPolicy,omitempty"` - // The ID of the app that is associated with the app entitlement. - AppID *string `json:"appId,omitempty"` - // The ID of the app resource that is associated with the app entitlement - AppResourceID *string `json:"appResourceId,omitempty"` - // The ID of the app resource type that is associated with the app entitlement - AppResourceTypeID *string `json:"appResourceTypeId,omitempty"` - // The ID of the policy that will be used for certify tickets related to the app entitlement. - CertifyPolicyID *string `json:"certifyPolicyId,omitempty"` - // The IDs of different compliance frameworks associated with this app entitlement ex (SOX, HIPAA, PCI, etc.) - ComplianceFrameworkValueIds []string `json:"complianceFrameworkValueIds,omitempty"` - // Flag to indicate if app-level access request defaults have been applied to the entitlement - DefaultValuesApplied *bool `json:"defaultValuesApplied,omitempty"` - // The description of the app entitlement. - Description *string `json:"description,omitempty"` - // The display name of the app entitlement. - DisplayName *string `json:"displayName,omitempty"` - DurationGrant *string `json:"durationGrant,omitempty"` - DurationUnset *AppEntitlementDurationUnset `json:"durationUnset,omitempty"` - // This enables tasks to be created in an emergency and use a selected emergency access policy. - EmergencyGrantEnabled *bool `json:"emergencyGrantEnabled,omitempty"` - // The ID of the policy that will be used for emergency access grant tasks. - EmergencyGrantPolicyID *string `json:"emergencyGrantPolicyId,omitempty"` - // The ID of the policy that will be used for grant tickets related to the app entitlement. - GrantPolicyID *string `json:"grantPolicyId,omitempty"` - // Flag to indicate if the app entitlement is manually managed. - IsManuallyManaged *bool `json:"isManuallyManaged,omitempty"` - // Flag to indicate if the app-level access request settings have been overridden for the entitlement - OverrideAccessRequestsDefaults *bool `json:"overrideAccessRequestsDefaults,omitempty"` - // The ID of the policy that will be used for revoke tickets related to the app entitlement - RevokePolicyID *string `json:"revokePolicyId,omitempty"` - // The riskLevelValueId field. - RiskLevelValueID *string `json:"riskLevelValueId,omitempty"` - // The slug is displayed as an oval next to the name in the frontend of C1, it tells you what permission the entitlement grants. See https://www.conductorone.com/docs/product/manage-access/entitlements/ - Slug *string `json:"slug,omitempty"` - // Map to tell us which connector the entitlement came from. - SourceConnectorIds map[string]string `json:"sourceConnectorIds,omitempty"` - UserEditedMask *string `json:"userEditedMask,omitempty"` + return o.Purpose } -func (o *AppEntitlementInput1) GetProvisionPolicy() *ProvisionPolicyInput { - if o == nil { - return nil - } - return o.ProvisionPolicy -} - -func (o *AppEntitlementInput1) GetAppID() *string { - if o == nil { - return nil - } - return o.AppID -} - -func (o *AppEntitlementInput1) GetAppResourceID() *string { - if o == nil { - return nil - } - return o.AppResourceID -} - -func (o *AppEntitlementInput1) GetAppResourceTypeID() *string { - if o == nil { - return nil - } - return o.AppResourceTypeID -} - -func (o *AppEntitlementInput1) GetCertifyPolicyID() *string { - if o == nil { - return nil - } - return o.CertifyPolicyID -} - -func (o *AppEntitlementInput1) GetComplianceFrameworkValueIds() []string { - if o == nil { - return nil - } - return o.ComplianceFrameworkValueIds -} - -func (o *AppEntitlementInput1) GetDefaultValuesApplied() *bool { - if o == nil { - return nil - } - return o.DefaultValuesApplied -} - -func (o *AppEntitlementInput1) GetDescription() *string { - if o == nil { - return nil - } - return o.Description -} - -func (o *AppEntitlementInput1) GetDisplayName() *string { - if o == nil { - return nil - } - return o.DisplayName -} - -func (o *AppEntitlementInput1) GetDurationGrant() *string { - if o == nil { - return nil - } - return o.DurationGrant -} - -func (o *AppEntitlementInput1) GetDurationUnset() *AppEntitlementDurationUnset { - if o == nil { - return nil - } - return o.DurationUnset -} - -func (o *AppEntitlementInput1) GetEmergencyGrantEnabled() *bool { - if o == nil { - return nil - } - return o.EmergencyGrantEnabled -} - -func (o *AppEntitlementInput1) GetEmergencyGrantPolicyID() *string { - if o == nil { - return nil - } - return o.EmergencyGrantPolicyID -} - -func (o *AppEntitlementInput1) GetGrantPolicyID() *string { - if o == nil { - return nil - } - return o.GrantPolicyID -} - -func (o *AppEntitlementInput1) GetIsManuallyManaged() *bool { - if o == nil { - return nil - } - return o.IsManuallyManaged -} - -func (o *AppEntitlementInput1) GetOverrideAccessRequestsDefaults() *bool { - if o == nil { - return nil - } - return o.OverrideAccessRequestsDefaults -} - -func (o *AppEntitlementInput1) GetRevokePolicyID() *string { +func (o *AppEntitlementInput) GetRevokePolicyID() *string { if o == nil { return nil } return o.RevokePolicyID } -func (o *AppEntitlementInput1) GetRiskLevelValueID() *string { +func (o *AppEntitlementInput) GetRiskLevelValueID() *string { if o == nil { return nil } return o.RiskLevelValueID } -func (o *AppEntitlementInput1) GetSlug() *string { +func (o *AppEntitlementInput) GetSlug() *string { if o == nil { return nil } return o.Slug } -func (o *AppEntitlementInput1) GetSourceConnectorIds() map[string]string { +func (o *AppEntitlementInput) GetSourceConnectorIds() map[string]string { if o == nil { return nil } return o.SourceConnectorIds } -func (o *AppEntitlementInput1) GetUserEditedMask() *string { +func (o *AppEntitlementInput) GetUserEditedMask() *string { if o == nil { return nil } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlementproxy.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlementproxy.go new file mode 100644 index 00000000..26eaf2a5 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlementproxy.go @@ -0,0 +1,107 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +import ( + "github.com/conductorone/conductorone-sdk-go/pkg/utils" + "time" +) + +// The AppEntitlementProxy message. +// +// This message contains a oneof named _implicit. Only a single field of the following list may be set at a time: +// - implicit +type AppEntitlementProxy struct { + CreatedAt *time.Time `json:"createdAt,omitempty"` + DeletedAt *time.Time `json:"deletedAt,omitempty"` + // The dstAppEntitlementId field. + DstAppEntitlementID *string `json:"dstAppEntitlementId,omitempty"` + // The dstAppId field. + DstAppID *string `json:"dstAppId,omitempty"` + // If true, the binding doesn't not exist yet and is from the list of the entitlements from the parent app. + // typically the IdP that handles provisioning for the app instead of C1s connector. + // This field is part of the `_implicit` oneof. + // See the documentation for `c1.api.app.v1.AppEntitlementProxy` for more details. + Implicit *bool `json:"implicit,omitempty"` + // The srcAppEntitlementId field. + SrcAppEntitlementID *string `json:"srcAppEntitlementId,omitempty"` + // The srcAppId field. + SrcAppID *string `json:"srcAppId,omitempty"` + // The systemBuiltin field. + SystemBuiltin *bool `json:"systemBuiltin,omitempty"` + UpdatedAt *time.Time `json:"updatedAt,omitempty"` +} + +func (a AppEntitlementProxy) MarshalJSON() ([]byte, error) { + return utils.MarshalJSON(a, "", false) +} + +func (a *AppEntitlementProxy) UnmarshalJSON(data []byte) error { + if err := utils.UnmarshalJSON(data, &a, "", false, false); err != nil { + return err + } + return nil +} + +func (o *AppEntitlementProxy) GetCreatedAt() *time.Time { + if o == nil { + return nil + } + return o.CreatedAt +} + +func (o *AppEntitlementProxy) GetDeletedAt() *time.Time { + if o == nil { + return nil + } + return o.DeletedAt +} + +func (o *AppEntitlementProxy) GetDstAppEntitlementID() *string { + if o == nil { + return nil + } + return o.DstAppEntitlementID +} + +func (o *AppEntitlementProxy) GetDstAppID() *string { + if o == nil { + return nil + } + return o.DstAppID +} + +func (o *AppEntitlementProxy) GetImplicit() *bool { + if o == nil { + return nil + } + return o.Implicit +} + +func (o *AppEntitlementProxy) GetSrcAppEntitlementID() *string { + if o == nil { + return nil + } + return o.SrcAppEntitlementID +} + +func (o *AppEntitlementProxy) GetSrcAppID() *string { + if o == nil { + return nil + } + return o.SrcAppID +} + +func (o *AppEntitlementProxy) GetSystemBuiltin() *bool { + if o == nil { + return nil + } + return o.SystemBuiltin +} + +func (o *AppEntitlementProxy) GetUpdatedAt() *time.Time { + if o == nil { + return nil + } + return o.UpdatedAt +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlementproxyexpandmask.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlementproxyexpandmask.go new file mode 100644 index 00000000..6802253b --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlementproxyexpandmask.go @@ -0,0 +1,16 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// The AppEntitlementProxyExpandMask message. +type AppEntitlementProxyExpandMask struct { + // The paths field. + Paths []string `json:"paths,omitempty"` +} + +func (o *AppEntitlementProxyExpandMask) GetPaths() []string { + if o == nil { + return nil + } + return o.Paths +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlementproxyview.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlementproxyview.go new file mode 100644 index 00000000..2a2b329b --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appentitlementproxyview.go @@ -0,0 +1,56 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// The AppEntitlementProxyView message. +type AppEntitlementProxyView struct { + // The AppEntitlementProxy message. + // + // This message contains a oneof named _implicit. Only a single field of the following list may be set at a time: + // - implicit + // + AppEntitlementProxy *AppEntitlementProxy `json:"appProxyEntitlement,omitempty"` + // The dstAppEntitlementPath field. + DstAppEntitlementPath *string `json:"dstAppEntitlementPath,omitempty"` + // The dstAppPath field. + DstAppPath *string `json:"dstAppPath,omitempty"` + // The srcAppEntitlementPath field. + SrcAppEntitlementPath *string `json:"srcAppEntitlementPath,omitempty"` + // The srcAppPath field. + SrcAppPath *string `json:"srcAppPath,omitempty"` +} + +func (o *AppEntitlementProxyView) GetAppEntitlementProxy() *AppEntitlementProxy { + if o == nil { + return nil + } + return o.AppEntitlementProxy +} + +func (o *AppEntitlementProxyView) GetDstAppEntitlementPath() *string { + if o == nil { + return nil + } + return o.DstAppEntitlementPath +} + +func (o *AppEntitlementProxyView) GetDstAppPath() *string { + if o == nil { + return nil + } + return o.DstAppPath +} + +func (o *AppEntitlementProxyView) GetSrcAppEntitlementPath() *string { + if o == nil { + return nil + } + return o.SrcAppEntitlementPath +} + +func (o *AppEntitlementProxyView) GetSrcAppPath() *string { + if o == nil { + return nil + } + return o.SrcAppPath +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/approvalinput.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/approvalinput.go new file mode 100644 index 00000000..8ddddb41 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/approvalinput.go @@ -0,0 +1,144 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// ApprovalInput - The Approval message. +// +// This message contains a oneof named typ. Only a single field of the following list may be set at a time: +// - users +// - manager +// - appOwners +// - group +// - self +// - entitlementOwners +// - expression +// - webhook +// - resourceOwners +type ApprovalInput struct { + // The AppGroupApproval object provides the configuration for setting a group as the approvers of an approval policy step. + AppGroupApproval *AppGroupApproval `json:"group,omitempty"` + // App owner approval provides the configuration for an approval step when the app owner is the target. + AppOwnerApproval *AppOwnerApproval `json:"appOwners,omitempty"` + // The entitlement owner approval allows configuration of the approval step when the target approvers are the entitlement owners. + EntitlementOwnerApproval *EntitlementOwnerApproval `json:"entitlementOwners,omitempty"` + // The ExpressionApproval message. + ExpressionApproval *ExpressionApproval `json:"expression,omitempty"` + // The manager approval object provides configuration options for approval when the target of the approval is the manager of the user in the task. + ManagerApproval *ManagerApprovalInput `json:"manager,omitempty"` + // The resource owner approval allows configuration of the approval step when the target approvers are the resource owners. + ResourceOwnerApproval *ResourceOwnerApproval `json:"resourceOwners,omitempty"` + // The self approval object describes the configuration of a policy step that needs to be approved by the target of the request. + SelfApproval *SelfApproval `json:"self,omitempty"` + // The user approval object describes the approval configuration of a policy step that needs to be approved by a specific list of users. + UserApproval *UserApproval `json:"users,omitempty"` + // The WebhookApproval message. + WebhookApproval *WebhookApproval `json:"webhook,omitempty"` + // Configuration to allow reassignment by reviewers during this step. + AllowReassignment *bool `json:"allowReassignment,omitempty"` + // A field indicating whether this step is assigned. + Assigned *bool `json:"assigned,omitempty"` + // Configuration to require a reason when approving this step. + RequireApprovalReason *bool `json:"requireApprovalReason,omitempty"` + // Configuration to require a reason when denying this step. + RequireDenialReason *bool `json:"requireDenialReason,omitempty"` + // Configuration to require a reason when reassigning this step. + RequireReassignmentReason *bool `json:"requireReassignmentReason,omitempty"` +} + +func (o *ApprovalInput) GetAppGroupApproval() *AppGroupApproval { + if o == nil { + return nil + } + return o.AppGroupApproval +} + +func (o *ApprovalInput) GetAppOwnerApproval() *AppOwnerApproval { + if o == nil { + return nil + } + return o.AppOwnerApproval +} + +func (o *ApprovalInput) GetEntitlementOwnerApproval() *EntitlementOwnerApproval { + if o == nil { + return nil + } + return o.EntitlementOwnerApproval +} + +func (o *ApprovalInput) GetExpressionApproval() *ExpressionApproval { + if o == nil { + return nil + } + return o.ExpressionApproval +} + +func (o *ApprovalInput) GetManagerApproval() *ManagerApprovalInput { + if o == nil { + return nil + } + return o.ManagerApproval +} + +func (o *ApprovalInput) GetResourceOwnerApproval() *ResourceOwnerApproval { + if o == nil { + return nil + } + return o.ResourceOwnerApproval +} + +func (o *ApprovalInput) GetSelfApproval() *SelfApproval { + if o == nil { + return nil + } + return o.SelfApproval +} + +func (o *ApprovalInput) GetUserApproval() *UserApproval { + if o == nil { + return nil + } + return o.UserApproval +} + +func (o *ApprovalInput) GetWebhookApproval() *WebhookApproval { + if o == nil { + return nil + } + return o.WebhookApproval +} + +func (o *ApprovalInput) GetAllowReassignment() *bool { + if o == nil { + return nil + } + return o.AllowReassignment +} + +func (o *ApprovalInput) GetAssigned() *bool { + if o == nil { + return nil + } + return o.Assigned +} + +func (o *ApprovalInput) GetRequireApprovalReason() *bool { + if o == nil { + return nil + } + return o.RequireApprovalReason +} + +func (o *ApprovalInput) GetRequireDenialReason() *bool { + if o == nil { + return nil + } + return o.RequireDenialReason +} + +func (o *ApprovalInput) GetRequireReassignmentReason() *bool { + if o == nil { + return nil + } + return o.RequireReassignmentReason +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appusercredential.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appusercredential.go index 1c18daae..12df8fda 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appusercredential.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appusercredential.go @@ -7,22 +7,21 @@ import ( "time" ) -// AppUserCredential - Application User that represents an account in the application. +// AppUserCredential - A credentials for the Application User that represents an account in the application. +// +// This message contains a oneof named credential. Only a single field of the following list may be set at a time: +// - encryptedData type AppUserCredential struct { // EncryptedData is a message that contains encrypted bytes and metadata. EncryptedData *EncryptedData `json:"encryptedData,omitempty"` // The ID of the application. AppID *string `json:"appId,omitempty"` - // A unique idenditfier of the application user. - AppUserID *string `json:"appUserId,omitempty"` - // The ID of the connector that generated this credential. - ConnectorID *string `json:"connectorId,omitempty"` - CreatedAt *time.Time `json:"createdAt,omitempty"` - DeletedAt *time.Time `json:"deletedAt,omitempty"` - // A unique idenditfier of the credential. - ID *string `json:"id,omitempty"` - // The ticket ID of the request that generated this credential. - TicketID *string `json:"ticketId,omitempty"` + // A unique identifier of the application user. + AppUserID *string `json:"appUserId,omitempty"` + CreatedAt *time.Time `json:"createdAt,omitempty"` + DeletedAt *time.Time `json:"deletedAt,omitempty"` + // A unique identifier of the credential. + ID *string `json:"id,omitempty"` UpdatedAt *time.Time `json:"updatedAt,omitempty"` } @@ -58,13 +57,6 @@ func (o *AppUserCredential) GetAppUserID() *string { return o.AppUserID } -func (o *AppUserCredential) GetConnectorID() *string { - if o == nil { - return nil - } - return o.ConnectorID -} - func (o *AppUserCredential) GetCreatedAt() *time.Time { if o == nil { return nil @@ -86,13 +78,6 @@ func (o *AppUserCredential) GetID() *string { return o.ID } -func (o *AppUserCredential) GetTicketID() *string { - if o == nil { - return nil - } - return o.TicketID -} - func (o *AppUserCredential) GetUpdatedAt() *time.Time { if o == nil { return nil diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appuserstatus.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appuserstatus.go index 623fa9c1..8e4070a8 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appuserstatus.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/appuserstatus.go @@ -2,17 +2,17 @@ package shared -// Status - The application user status field. -type Status string +// AppUserStatusStatus - The application user status field. +type AppUserStatusStatus string const ( - StatusStatusUnspecified Status = "STATUS_UNSPECIFIED" - StatusStatusEnabled Status = "STATUS_ENABLED" - StatusStatusDisabled Status = "STATUS_DISABLED" - StatusStatusDeleted Status = "STATUS_DELETED" + AppUserStatusStatusStatusUnspecified AppUserStatusStatus = "STATUS_UNSPECIFIED" + AppUserStatusStatusStatusEnabled AppUserStatusStatus = "STATUS_ENABLED" + AppUserStatusStatusStatusDisabled AppUserStatusStatus = "STATUS_DISABLED" + AppUserStatusStatusStatusDeleted AppUserStatusStatus = "STATUS_DELETED" ) -func (e Status) ToPointer() *Status { +func (e AppUserStatusStatus) ToPointer() *AppUserStatusStatus { return &e } @@ -21,7 +21,7 @@ type AppUserStatus struct { // The details of applicaiton user status. Details *string `json:"details,omitempty"` // The application user status field. - Status *Status `json:"status,omitempty"` + Status *AppUserStatusStatus `json:"status,omitempty"` } func (o *AppUserStatus) GetDetails() *string { @@ -31,7 +31,7 @@ func (o *AppUserStatus) GetDetails() *string { return o.Details } -func (o *AppUserStatus) GetStatus() *Status { +func (o *AppUserStatus) GetStatus() *AppUserStatusStatus { if o == nil { return nil } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/bundleautomation.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/bundleautomation.go index f483e99a..7f71989b 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/bundleautomation.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/bundleautomation.go @@ -16,8 +16,10 @@ type BundleAutomation struct { BundleAutomationLastRunState *BundleAutomationLastRunState `json:"state,omitempty"` // The BundleAutomationRuleEntitlement message. BundleAutomationRuleEntitlement *BundleAutomationRuleEntitlement `json:"entitlements,omitempty"` - CreatedAt *time.Time `json:"createdAt,omitempty"` - DeletedAt *time.Time `json:"deletedAt,omitempty"` + // The createTasks field. + CreateTasks *bool `json:"createTasks,omitempty"` + CreatedAt *time.Time `json:"createdAt,omitempty"` + DeletedAt *time.Time `json:"deletedAt,omitempty"` // The enabled field. Enabled *bool `json:"enabled,omitempty"` // The requestCatalogId field. @@ -52,6 +54,13 @@ func (o *BundleAutomation) GetBundleAutomationRuleEntitlement() *BundleAutomatio return o.BundleAutomationRuleEntitlement } +func (o *BundleAutomation) GetCreateTasks() *bool { + if o == nil { + return nil + } + return o.CreateTasks +} + func (o *BundleAutomation) GetCreatedAt() *time.Time { if o == nil { return nil diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/bundleautomationlastrunstate.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/bundleautomationlastrunstate.go index 24f81065..b997b632 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/bundleautomationlastrunstate.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/bundleautomationlastrunstate.go @@ -23,7 +23,9 @@ func (e BundleAutomationLastRunStateStatus) ToPointer() *BundleAutomationLastRun // The BundleAutomationLastRunState message. type BundleAutomationLastRunState struct { - LastRunAt *time.Time `json:"lastRunAt,omitempty"` + // The errorMessage field. + ErrorMessage *string `json:"errorMessage,omitempty"` + LastRunAt *time.Time `json:"lastRunAt,omitempty"` // The status field. Status *BundleAutomationLastRunStateStatus `json:"status,omitempty"` } @@ -39,6 +41,13 @@ func (b *BundleAutomationLastRunState) UnmarshalJSON(data []byte) error { return nil } +func (o *BundleAutomationLastRunState) GetErrorMessage() *string { + if o == nil { + return nil + } + return o.ErrorMessage +} + func (o *BundleAutomationLastRunState) GetLastRunAt() *time.Time { if o == nil { return nil diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/cidrrestriction.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/cidrrestriction.go new file mode 100644 index 00000000..6916ed47 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/cidrrestriction.go @@ -0,0 +1,25 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// The CIDRRestriction message. +type CIDRRestriction struct { + // The enabled field. + Enabled *bool `json:"enabled,omitempty"` + // The sourceCidr field. + SourceCidr []string `json:"sourceCidr,omitempty"` +} + +func (o *CIDRRestriction) GetEnabled() *bool { + if o == nil { + return nil + } + return o.Enabled +} + +func (o *CIDRRestriction) GetSourceCidr() []string { + if o == nil { + return nil + } + return o.SourceCidr +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementproxyrequest.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementproxyrequest.go new file mode 100644 index 00000000..6c5189d0 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementproxyrequest.go @@ -0,0 +1,16 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// The CreateAppEntitlementProxyRequest message. +type CreateAppEntitlementProxyRequest struct { + // The AppEntitlementProxyExpandMask message. + AppEntitlementProxyExpandMask *AppEntitlementProxyExpandMask `json:"expandMask,omitempty"` +} + +func (o *CreateAppEntitlementProxyRequest) GetAppEntitlementProxyExpandMask() *AppEntitlementProxyExpandMask { + if o == nil { + return nil + } + return o.AppEntitlementProxyExpandMask +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementproxyresponse.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementproxyresponse.go new file mode 100644 index 00000000..ee0db3d2 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementproxyresponse.go @@ -0,0 +1,61 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +import ( + "github.com/conductorone/conductorone-sdk-go/pkg/utils" +) + +// CreateAppEntitlementProxyResponseExpanded - Contains an arbitrary serialized message along with a @type that describes the type of the serialized message. +type CreateAppEntitlementProxyResponseExpanded struct { + // The type of the serialized message. + AtType *string `json:"@type,omitempty"` + AdditionalProperties map[string]any `additionalProperties:"true" json:"-"` +} + +func (c CreateAppEntitlementProxyResponseExpanded) MarshalJSON() ([]byte, error) { + return utils.MarshalJSON(c, "", false) +} + +func (c *CreateAppEntitlementProxyResponseExpanded) UnmarshalJSON(data []byte) error { + if err := utils.UnmarshalJSON(data, &c, "", false, false); err != nil { + return err + } + return nil +} + +func (o *CreateAppEntitlementProxyResponseExpanded) GetAtType() *string { + if o == nil { + return nil + } + return o.AtType +} + +func (o *CreateAppEntitlementProxyResponseExpanded) GetAdditionalProperties() map[string]any { + if o == nil { + return nil + } + return o.AdditionalProperties +} + +// The CreateAppEntitlementProxyResponse message. +type CreateAppEntitlementProxyResponse struct { + // The AppEntitlementProxyView message. + AppEntitlementProxyView *AppEntitlementProxyView `json:"appProxyEntitlementView,omitempty"` + // The expanded field. + Expanded []CreateAppEntitlementProxyResponseExpanded `json:"expanded,omitempty"` +} + +func (o *CreateAppEntitlementProxyResponse) GetAppEntitlementProxyView() *AppEntitlementProxyView { + if o == nil { + return nil + } + return o.AppEntitlementProxyView +} + +func (o *CreateAppEntitlementProxyResponse) GetExpanded() []CreateAppEntitlementProxyResponseExpanded { + if o == nil { + return nil + } + return o.Expanded +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementrequest.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementrequest.go index 619723bb..cc858558 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementrequest.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/createappentitlementrequest.go @@ -2,28 +2,75 @@ package shared +type CreateAppEntitlementRequestDurationUnset struct { +} + +// CreateAppEntitlementRequestPurpose - The purpose field. +type CreateAppEntitlementRequestPurpose string + +const ( + CreateAppEntitlementRequestPurposeAppEntitlementPurposeValueUnspecified CreateAppEntitlementRequestPurpose = "APP_ENTITLEMENT_PURPOSE_VALUE_UNSPECIFIED" + CreateAppEntitlementRequestPurposeAppEntitlementPurposeValueAssignment CreateAppEntitlementRequestPurpose = "APP_ENTITLEMENT_PURPOSE_VALUE_ASSIGNMENT" + CreateAppEntitlementRequestPurposeAppEntitlementPurposeValuePermission CreateAppEntitlementRequestPurpose = "APP_ENTITLEMENT_PURPOSE_VALUE_PERMISSION" +) + +func (e CreateAppEntitlementRequestPurpose) ToPointer() *CreateAppEntitlementRequestPurpose { + return &e +} + // The CreateAppEntitlementRequest message. +// +// This message contains a oneof named max_grant_duration. Only a single field of the following list may be set at a time: +// - durationUnset +// - durationGrant type CreateAppEntitlementRequest struct { // The app entitlement expand mask allows the user to get additional information when getting responses containing app entitlement views. AppEntitlementExpandMask *AppEntitlementExpandMask `json:"expandMask,omitempty"` + // ProvisionPolicy is a oneOf that indicates how a provision step should be processed. + // + // This message contains a oneof named typ. Only a single field of the following list may be set at a time: + // - connector + // - manual + // - delegated + // - webhook + // - multiStep + // - externalTicket + // + ProvisionPolicy *ProvisionPolicyInput `json:"provisionPolicy,omitempty"` + // The alias field. + Alias *string `json:"alias,omitempty"` // The appEntitlementOwnerIds field. AppEntitlementOwnerIds []string `json:"appEntitlementOwnerIds,omitempty"` // The appResourceId field. AppResourceID *string `json:"appResourceId,omitempty"` // The appResourceTypeId field. AppResourceTypeID *string `json:"appResourceTypeId,omitempty"` + // The certifyPolicyId field. + CertifyPolicyID *string `json:"certifyPolicyId,omitempty"` + // The complianceFrameworkValueIds field. + ComplianceFrameworkValueIds []string `json:"complianceFrameworkValueIds,omitempty"` // The description field. Description *string `json:"description,omitempty"` // The displayName field. - DisplayName *string `json:"displayName,omitempty"` - // The entitlementSlug field. - EntitlementSlug *string `json:"entitlementSlug,omitempty"` - // The isAutomationEnabled field. - IsAutomationEnabled *bool `json:"isAutomationEnabled,omitempty"` - // The linkedIdpEntitlementAppId field. - LinkedIdpEntitlementAppID *string `json:"linkedIdpEntitlementAppId,omitempty"` - // The linkedIdpEntitlementId field. - LinkedIdpEntitlementID *string `json:"linkedIdpEntitlementId,omitempty"` + DisplayName *string `json:"displayName,omitempty"` + DurationGrant *string `json:"durationGrant,omitempty"` + DurationUnset *CreateAppEntitlementRequestDurationUnset `json:"durationUnset,omitempty"` + // The emergencyGrantEnabled field. + EmergencyGrantEnabled *bool `json:"emergencyGrantEnabled,omitempty"` + // The emergencyGrantPolicyId field. + EmergencyGrantPolicyID *string `json:"emergencyGrantPolicyId,omitempty"` + // The grantPolicyId field. + GrantPolicyID *string `json:"grantPolicyId,omitempty"` + // The overrideAccessRequestsDefaults field. + OverrideAccessRequestsDefaults *bool `json:"overrideAccessRequestsDefaults,omitempty"` + // The purpose field. + Purpose *CreateAppEntitlementRequestPurpose `json:"purpose,omitempty"` + // The revokePolicyId field. + RevokePolicyID *string `json:"revokePolicyId,omitempty"` + // The riskLevelValueId field. + RiskLevelValueID *string `json:"riskLevelValueId,omitempty"` + // The slug field. + Slug *string `json:"slug,omitempty"` } func (o *CreateAppEntitlementRequest) GetAppEntitlementExpandMask() *AppEntitlementExpandMask { @@ -33,6 +80,20 @@ func (o *CreateAppEntitlementRequest) GetAppEntitlementExpandMask() *AppEntitlem return o.AppEntitlementExpandMask } +func (o *CreateAppEntitlementRequest) GetProvisionPolicy() *ProvisionPolicyInput { + if o == nil { + return nil + } + return o.ProvisionPolicy +} + +func (o *CreateAppEntitlementRequest) GetAlias() *string { + if o == nil { + return nil + } + return o.Alias +} + func (o *CreateAppEntitlementRequest) GetAppEntitlementOwnerIds() []string { if o == nil { return nil @@ -54,6 +115,20 @@ func (o *CreateAppEntitlementRequest) GetAppResourceTypeID() *string { return o.AppResourceTypeID } +func (o *CreateAppEntitlementRequest) GetCertifyPolicyID() *string { + if o == nil { + return nil + } + return o.CertifyPolicyID +} + +func (o *CreateAppEntitlementRequest) GetComplianceFrameworkValueIds() []string { + if o == nil { + return nil + } + return o.ComplianceFrameworkValueIds +} + func (o *CreateAppEntitlementRequest) GetDescription() *string { if o == nil { return nil @@ -68,30 +143,72 @@ func (o *CreateAppEntitlementRequest) GetDisplayName() *string { return o.DisplayName } -func (o *CreateAppEntitlementRequest) GetEntitlementSlug() *string { +func (o *CreateAppEntitlementRequest) GetDurationGrant() *string { + if o == nil { + return nil + } + return o.DurationGrant +} + +func (o *CreateAppEntitlementRequest) GetDurationUnset() *CreateAppEntitlementRequestDurationUnset { + if o == nil { + return nil + } + return o.DurationUnset +} + +func (o *CreateAppEntitlementRequest) GetEmergencyGrantEnabled() *bool { + if o == nil { + return nil + } + return o.EmergencyGrantEnabled +} + +func (o *CreateAppEntitlementRequest) GetEmergencyGrantPolicyID() *string { + if o == nil { + return nil + } + return o.EmergencyGrantPolicyID +} + +func (o *CreateAppEntitlementRequest) GetGrantPolicyID() *string { + if o == nil { + return nil + } + return o.GrantPolicyID +} + +func (o *CreateAppEntitlementRequest) GetOverrideAccessRequestsDefaults() *bool { + if o == nil { + return nil + } + return o.OverrideAccessRequestsDefaults +} + +func (o *CreateAppEntitlementRequest) GetPurpose() *CreateAppEntitlementRequestPurpose { if o == nil { return nil } - return o.EntitlementSlug + return o.Purpose } -func (o *CreateAppEntitlementRequest) GetIsAutomationEnabled() *bool { +func (o *CreateAppEntitlementRequest) GetRevokePolicyID() *string { if o == nil { return nil } - return o.IsAutomationEnabled + return o.RevokePolicyID } -func (o *CreateAppEntitlementRequest) GetLinkedIdpEntitlementAppID() *string { +func (o *CreateAppEntitlementRequest) GetRiskLevelValueID() *string { if o == nil { return nil } - return o.LinkedIdpEntitlementAppID + return o.RiskLevelValueID } -func (o *CreateAppEntitlementRequest) GetLinkedIdpEntitlementID() *string { +func (o *CreateAppEntitlementRequest) GetSlug() *string { if o == nil { return nil } - return o.LinkedIdpEntitlementID + return o.Slug } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/deleteappentitlementproxyrequest.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/deleteappentitlementproxyrequest.go new file mode 100644 index 00000000..1d62fc5f --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/deleteappentitlementproxyrequest.go @@ -0,0 +1,7 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// The DeleteAppEntitlementProxyRequest message. +type DeleteAppEntitlementProxyRequest struct { +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/deleteappentitlementproxyresponse.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/deleteappentitlementproxyresponse.go new file mode 100644 index 00000000..7b9900ce --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/deleteappentitlementproxyresponse.go @@ -0,0 +1,7 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// The DeleteAppEntitlementProxyResponse message. +type DeleteAppEntitlementProxyResponse struct { +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/getappentitlementproxyresponse.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/getappentitlementproxyresponse.go new file mode 100644 index 00000000..0aa34260 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/getappentitlementproxyresponse.go @@ -0,0 +1,61 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +import ( + "github.com/conductorone/conductorone-sdk-go/pkg/utils" +) + +// GetAppEntitlementProxyResponseExpanded - Contains an arbitrary serialized message along with a @type that describes the type of the serialized message. +type GetAppEntitlementProxyResponseExpanded struct { + // The type of the serialized message. + AtType *string `json:"@type,omitempty"` + AdditionalProperties map[string]any `additionalProperties:"true" json:"-"` +} + +func (g GetAppEntitlementProxyResponseExpanded) MarshalJSON() ([]byte, error) { + return utils.MarshalJSON(g, "", false) +} + +func (g *GetAppEntitlementProxyResponseExpanded) UnmarshalJSON(data []byte) error { + if err := utils.UnmarshalJSON(data, &g, "", false, false); err != nil { + return err + } + return nil +} + +func (o *GetAppEntitlementProxyResponseExpanded) GetAtType() *string { + if o == nil { + return nil + } + return o.AtType +} + +func (o *GetAppEntitlementProxyResponseExpanded) GetAdditionalProperties() map[string]any { + if o == nil { + return nil + } + return o.AdditionalProperties +} + +// The GetAppEntitlementProxyResponse message. +type GetAppEntitlementProxyResponse struct { + // The AppEntitlementProxyView message. + AppEntitlementProxyView *AppEntitlementProxyView `json:"appProxyEntitlementView,omitempty"` + // The expanded field. + Expanded []GetAppEntitlementProxyResponseExpanded `json:"expanded,omitempty"` +} + +func (o *GetAppEntitlementProxyResponse) GetAppEntitlementProxyView() *AppEntitlementProxyView { + if o == nil { + return nil + } + return o.AppEntitlementProxyView +} + +func (o *GetAppEntitlementProxyResponse) GetExpanded() []GetAppEntitlementProxyResponseExpanded { + if o == nil { + return nil + } + return o.Expanded +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/managerapprovalinput.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/managerapprovalinput.go new file mode 100644 index 00000000..968c1507 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/managerapprovalinput.go @@ -0,0 +1,34 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// ManagerApprovalInput - The manager approval object provides configuration options for approval when the target of the approval is the manager of the user in the task. +type ManagerApprovalInput struct { + // Configuration to allow self approval if the target user is their own manager. This may occur if a service account has an identity user and manager specified as the same person. + AllowSelfApproval *bool `json:"allowSelfApproval,omitempty"` + // Configuration to allow a fallback if no manager is found. + Fallback *bool `json:"fallback,omitempty"` + // Configuration to specific which users to fallback to if fallback is enabled and no manager is found. + FallbackUserIds []string `json:"fallbackUserIds,omitempty"` +} + +func (o *ManagerApprovalInput) GetAllowSelfApproval() *bool { + if o == nil { + return nil + } + return o.AllowSelfApproval +} + +func (o *ManagerApprovalInput) GetFallback() *bool { + if o == nil { + return nil + } + return o.Fallback +} + +func (o *ManagerApprovalInput) GetFallbackUserIds() []string { + if o == nil { + return nil + } + return o.FallbackUserIds +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/policystepinput.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/policystepinput.go new file mode 100644 index 00000000..778535dd --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/policystepinput.go @@ -0,0 +1,75 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// PolicyStepInput - The PolicyStep message. +// +// This message contains a oneof named step. Only a single field of the following list may be set at a time: +// - approval +// - provision +// - accept +// - reject +// - wait +type PolicyStepInput struct { + // This policy step indicates that a ticket should have an approved outcome. This is a terminal approval state and is used to explicitly define the end of approval steps. + Accept *Accept `json:"accept,omitempty"` + // The Approval message. + // + // This message contains a oneof named typ. Only a single field of the following list may be set at a time: + // - users + // - manager + // - appOwners + // - group + // - self + // - entitlementOwners + // - expression + // - webhook + // - resourceOwners + // + Approval *ApprovalInput `json:"approval,omitempty"` + // The provision step references a provision policy for this step. + Provision *Provision `json:"provision,omitempty"` + // This policy step indicates that a ticket should have a denied outcome. This is a terminal approval state and is used to explicitly define the end of approval steps. + Reject *Reject `json:"reject,omitempty"` + // Define a Wait step for a policy to wait on a condition to be met. + // + // This message contains a oneof named until. Only a single field of the following list may be set at a time: + // - condition + // + Wait *Wait `json:"wait,omitempty"` +} + +func (o *PolicyStepInput) GetAccept() *Accept { + if o == nil { + return nil + } + return o.Accept +} + +func (o *PolicyStepInput) GetApproval() *ApprovalInput { + if o == nil { + return nil + } + return o.Approval +} + +func (o *PolicyStepInput) GetProvision() *Provision { + if o == nil { + return nil + } + return o.Provision +} + +func (o *PolicyStepInput) GetReject() *Reject { + if o == nil { + return nil + } + return o.Reject +} + +func (o *PolicyStepInput) GetWait() *Wait { + if o == nil { + return nil + } + return o.Wait +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/policystepsinput.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/policystepsinput.go index 7ce21bf0..7e6022d6 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/policystepsinput.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/policystepsinput.go @@ -5,10 +5,10 @@ package shared // PolicyStepsInput - The PolicySteps message. type PolicyStepsInput struct { // An array of policy steps indicating the processing flow of a policy. These steps are oneOfs, and only one property may be set for each array index at a time. - Steps []PolicyStep `json:"steps,omitempty"` + Steps []PolicyStepInput `json:"steps,omitempty"` } -func (o *PolicyStepsInput) GetSteps() []PolicyStep { +func (o *PolicyStepsInput) GetSteps() []PolicyStepInput { if o == nil { return nil } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/requestcatalog.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/requestcatalog.go index 0a45c015..da2b3490 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/requestcatalog.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/requestcatalog.go @@ -7,6 +7,46 @@ import ( "time" ) +// EnrollmentBehavior - Defines how to handle the request policies of the entitlements in the catalog during enrollment. +type EnrollmentBehavior string + +const ( + EnrollmentBehaviorRequestCatalogEnrollmentBehaviorUnspecified EnrollmentBehavior = "REQUEST_CATALOG_ENROLLMENT_BEHAVIOR_UNSPECIFIED" + EnrollmentBehaviorRequestCatalogEnrollmentBehaviorBypassEntitlementRequestPolicy EnrollmentBehavior = "REQUEST_CATALOG_ENROLLMENT_BEHAVIOR_BYPASS_ENTITLEMENT_REQUEST_POLICY" + EnrollmentBehaviorRequestCatalogEnrollmentBehaviorEnforceEntitlementRequestPolicy EnrollmentBehavior = "REQUEST_CATALOG_ENROLLMENT_BEHAVIOR_ENFORCE_ENTITLEMENT_REQUEST_POLICY" +) + +func (e EnrollmentBehavior) ToPointer() *EnrollmentBehavior { + return &e +} + +// UnenrollmentBehavior - Defines how to handle the revocation of the entitlements in the catalog during unenrollment. +type UnenrollmentBehavior string + +const ( + UnenrollmentBehaviorRequestCatalogUnenrollmentBehaviorUnspecified UnenrollmentBehavior = "REQUEST_CATALOG_UNENROLLMENT_BEHAVIOR_UNSPECIFIED" + UnenrollmentBehaviorRequestCatalogUnenrollmentBehaviorLeaveAccessAsIs UnenrollmentBehavior = "REQUEST_CATALOG_UNENROLLMENT_BEHAVIOR_LEAVE_ACCESS_AS_IS" + UnenrollmentBehaviorRequestCatalogUnenrollmentBehaviorRevokeAll UnenrollmentBehavior = "REQUEST_CATALOG_UNENROLLMENT_BEHAVIOR_REVOKE_ALL" + UnenrollmentBehaviorRequestCatalogUnenrollmentBehaviorRevokeUnjustified UnenrollmentBehavior = "REQUEST_CATALOG_UNENROLLMENT_BEHAVIOR_REVOKE_UNJUSTIFIED" +) + +func (e UnenrollmentBehavior) ToPointer() *UnenrollmentBehavior { + return &e +} + +// UnenrollmentEntitlementBehavior - Defines how to handle the revoke policies of the entitlements in the catalog during unenrollment. +type UnenrollmentEntitlementBehavior string + +const ( + UnenrollmentEntitlementBehaviorRequestCatalogUnenrollmentEntitlementBehaviorUnspecified UnenrollmentEntitlementBehavior = "REQUEST_CATALOG_UNENROLLMENT_ENTITLEMENT_BEHAVIOR_UNSPECIFIED" + UnenrollmentEntitlementBehaviorRequestCatalogUnenrollmentEntitlementBehaviorBypass UnenrollmentEntitlementBehavior = "REQUEST_CATALOG_UNENROLLMENT_ENTITLEMENT_BEHAVIOR_BYPASS" + UnenrollmentEntitlementBehaviorRequestCatalogUnenrollmentEntitlementBehaviorEnforce UnenrollmentEntitlementBehavior = "REQUEST_CATALOG_UNENROLLMENT_ENTITLEMENT_BEHAVIOR_ENFORCE" +) + +func (e UnenrollmentEntitlementBehavior) ToPointer() *UnenrollmentEntitlementBehavior { + return &e +} + // The RequestCatalog is used for managing which entitlements are requestable, and who can request them. type RequestCatalog struct { // An array of app entitlements that, if the user has, can view the contents of this catalog. @@ -21,13 +61,19 @@ type RequestCatalog struct { Description *string `json:"description,omitempty"` // The display name of the request catalog. DisplayName *string `json:"displayName,omitempty"` + // Defines how to handle the request policies of the entitlements in the catalog during enrollment. + EnrollmentBehavior *EnrollmentBehavior `json:"enrollmentBehavior,omitempty"` // The id of the request catalog. ID *string `json:"id,omitempty"` // Whether or not this catalog is published. Published *bool `json:"published,omitempty"` // Whether all the entitlements in the catalog can be requests at once. Your tenant must have the bundles feature to use this. - RequestBundle *bool `json:"requestBundle,omitempty"` - UpdatedAt *time.Time `json:"updatedAt,omitempty"` + RequestBundle *bool `json:"requestBundle,omitempty"` + // Defines how to handle the revocation of the entitlements in the catalog during unenrollment. + UnenrollmentBehavior *UnenrollmentBehavior `json:"unenrollmentBehavior,omitempty"` + // Defines how to handle the revoke policies of the entitlements in the catalog during unenrollment. + UnenrollmentEntitlementBehavior *UnenrollmentEntitlementBehavior `json:"unenrollmentEntitlementBehavior,omitempty"` + UpdatedAt *time.Time `json:"updatedAt,omitempty"` // If this is true, the access entitlement requirement is ignored. VisibleToEveryone *bool `json:"visibleToEveryone,omitempty"` } @@ -92,6 +138,13 @@ func (o *RequestCatalog) GetDisplayName() *string { return o.DisplayName } +func (o *RequestCatalog) GetEnrollmentBehavior() *EnrollmentBehavior { + if o == nil { + return nil + } + return o.EnrollmentBehavior +} + func (o *RequestCatalog) GetID() *string { if o == nil { return nil @@ -113,6 +166,20 @@ func (o *RequestCatalog) GetRequestBundle() *bool { return o.RequestBundle } +func (o *RequestCatalog) GetUnenrollmentBehavior() *UnenrollmentBehavior { + if o == nil { + return nil + } + return o.UnenrollmentBehavior +} + +func (o *RequestCatalog) GetUnenrollmentEntitlementBehavior() *UnenrollmentEntitlementBehavior { + if o == nil { + return nil + } + return o.UnenrollmentEntitlementBehavior +} + func (o *RequestCatalog) GetUpdatedAt() *time.Time { if o == nil { return nil @@ -126,3 +193,115 @@ func (o *RequestCatalog) GetVisibleToEveryone() *bool { } return o.VisibleToEveryone } + +// RequestCatalogInput - The RequestCatalog is used for managing which entitlements are requestable, and who can request them. +type RequestCatalogInput struct { + // An array of app entitlements that, if the user has, can view the contents of this catalog. + AccessEntitlements []AppEntitlementInput `json:"accessEntitlements,omitempty"` + // The Apps contained in this request catalog. + AppIds []string `json:"appIds,omitempty"` + // The id of the user this request catalog was created by. + CreatedByUserID *string `json:"createdByUserId,omitempty"` + // The description of the request catalog. + Description *string `json:"description,omitempty"` + // The display name of the request catalog. + DisplayName *string `json:"displayName,omitempty"` + // Defines how to handle the request policies of the entitlements in the catalog during enrollment. + EnrollmentBehavior *EnrollmentBehavior `json:"enrollmentBehavior,omitempty"` + // The id of the request catalog. + ID *string `json:"id,omitempty"` + // Whether or not this catalog is published. + Published *bool `json:"published,omitempty"` + // Whether all the entitlements in the catalog can be requests at once. Your tenant must have the bundles feature to use this. + RequestBundle *bool `json:"requestBundle,omitempty"` + // Defines how to handle the revocation of the entitlements in the catalog during unenrollment. + UnenrollmentBehavior *UnenrollmentBehavior `json:"unenrollmentBehavior,omitempty"` + // Defines how to handle the revoke policies of the entitlements in the catalog during unenrollment. + UnenrollmentEntitlementBehavior *UnenrollmentEntitlementBehavior `json:"unenrollmentEntitlementBehavior,omitempty"` + // If this is true, the access entitlement requirement is ignored. + VisibleToEveryone *bool `json:"visibleToEveryone,omitempty"` +} + +func (o *RequestCatalogInput) GetAccessEntitlements() []AppEntitlementInput { + if o == nil { + return nil + } + return o.AccessEntitlements +} + +func (o *RequestCatalogInput) GetAppIds() []string { + if o == nil { + return nil + } + return o.AppIds +} + +func (o *RequestCatalogInput) GetCreatedByUserID() *string { + if o == nil { + return nil + } + return o.CreatedByUserID +} + +func (o *RequestCatalogInput) GetDescription() *string { + if o == nil { + return nil + } + return o.Description +} + +func (o *RequestCatalogInput) GetDisplayName() *string { + if o == nil { + return nil + } + return o.DisplayName +} + +func (o *RequestCatalogInput) GetEnrollmentBehavior() *EnrollmentBehavior { + if o == nil { + return nil + } + return o.EnrollmentBehavior +} + +func (o *RequestCatalogInput) GetID() *string { + if o == nil { + return nil + } + return o.ID +} + +func (o *RequestCatalogInput) GetPublished() *bool { + if o == nil { + return nil + } + return o.Published +} + +func (o *RequestCatalogInput) GetRequestBundle() *bool { + if o == nil { + return nil + } + return o.RequestBundle +} + +func (o *RequestCatalogInput) GetUnenrollmentBehavior() *UnenrollmentBehavior { + if o == nil { + return nil + } + return o.UnenrollmentBehavior +} + +func (o *RequestCatalogInput) GetUnenrollmentEntitlementBehavior() *UnenrollmentEntitlementBehavior { + if o == nil { + return nil + } + return o.UnenrollmentEntitlementBehavior +} + +func (o *RequestCatalogInput) GetVisibleToEveryone() *bool { + if o == nil { + return nil + } + return o.VisibleToEveryone +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/requestcataloginput.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/requestcataloginput.go deleted file mode 100644 index 80b49ff7..00000000 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/requestcataloginput.go +++ /dev/null @@ -1,88 +0,0 @@ -// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. - -package shared - -// RequestCatalogInput - The RequestCatalog is used for managing which entitlements are requestable, and who can request them. -type RequestCatalogInput struct { - // An array of app entitlements that, if the user has, can view the contents of this catalog. - AccessEntitlements []AppEntitlementInput1 `json:"accessEntitlements,omitempty"` - // The Apps contained in this request catalog. - AppIds []string `json:"appIds,omitempty"` - // The id of the user this request catalog was created by. - CreatedByUserID *string `json:"createdByUserId,omitempty"` - // The description of the request catalog. - Description *string `json:"description,omitempty"` - // The display name of the request catalog. - DisplayName *string `json:"displayName,omitempty"` - // The id of the request catalog. - ID *string `json:"id,omitempty"` - // Whether or not this catalog is published. - Published *bool `json:"published,omitempty"` - // Whether all the entitlements in the catalog can be requests at once. Your tenant must have the bundles feature to use this. - RequestBundle *bool `json:"requestBundle,omitempty"` - // If this is true, the access entitlement requirement is ignored. - VisibleToEveryone *bool `json:"visibleToEveryone,omitempty"` -} - -func (o *RequestCatalogInput) GetAccessEntitlements() []AppEntitlementInput1 { - if o == nil { - return nil - } - return o.AccessEntitlements -} - -func (o *RequestCatalogInput) GetAppIds() []string { - if o == nil { - return nil - } - return o.AppIds -} - -func (o *RequestCatalogInput) GetCreatedByUserID() *string { - if o == nil { - return nil - } - return o.CreatedByUserID -} - -func (o *RequestCatalogInput) GetDescription() *string { - if o == nil { - return nil - } - return o.Description -} - -func (o *RequestCatalogInput) GetDisplayName() *string { - if o == nil { - return nil - } - return o.DisplayName -} - -func (o *RequestCatalogInput) GetID() *string { - if o == nil { - return nil - } - return o.ID -} - -func (o *RequestCatalogInput) GetPublished() *bool { - if o == nil { - return nil - } - return o.Published -} - -func (o *RequestCatalogInput) GetRequestBundle() *bool { - if o == nil { - return nil - } - return o.RequestBundle -} - -func (o *RequestCatalogInput) GetVisibleToEveryone() *bool { - if o == nil { - return nil - } - return o.VisibleToEveryone -} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/sessionsettings.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/sessionsettings.go index 08223da9..cc510760 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/sessionsettings.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/sessionsettings.go @@ -4,7 +4,52 @@ package shared // The SessionSettings message. type SessionSettings struct { - MaxSessionLength *string `json:"maxSessionLength,omitempty"` + // The CIDRRestriction message. + CIDRRestriction *CIDRRestriction `json:"connectorSource,omitempty"` + // The CIDRRestriction message. + CIDRRestriction1 *CIDRRestriction `json:"pccAdminSource,omitempty"` + // The CIDRRestriction message. + CIDRRestriction2 *CIDRRestriction `json:"pccUserSource,omitempty"` + // The CIDRRestriction message. + CIDRRestriction3 *CIDRRestriction `json:"ssoAdminSource,omitempty"` + // The CIDRRestriction message. + CIDRRestriction4 *CIDRRestriction `json:"ssoUserSource,omitempty"` + MaxSessionLength *string `json:"maxSessionLength,omitempty"` +} + +func (o *SessionSettings) GetCIDRRestriction() *CIDRRestriction { + if o == nil { + return nil + } + return o.CIDRRestriction +} + +func (o *SessionSettings) GetCIDRRestriction1() *CIDRRestriction { + if o == nil { + return nil + } + return o.CIDRRestriction1 +} + +func (o *SessionSettings) GetCIDRRestriction2() *CIDRRestriction { + if o == nil { + return nil + } + return o.CIDRRestriction2 +} + +func (o *SessionSettings) GetCIDRRestriction3() *CIDRRestriction { + if o == nil { + return nil + } + return o.CIDRRestriction3 +} + +func (o *SessionSettings) GetCIDRRestriction4() *CIDRRestriction { + if o == nil { + return nil + } + return o.CIDRRestriction4 } func (o *SessionSettings) GetMaxSessionLength() *string { diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/setbundleautomationrequest.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/setbundleautomationrequest.go index b3f82c8d..d07be168 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/setbundleautomationrequest.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/setbundleautomationrequest.go @@ -9,6 +9,8 @@ package shared type SetBundleAutomationRequest struct { // The BundleAutomationRuleEntitlement message. BundleAutomationRuleEntitlement *BundleAutomationRuleEntitlement `json:"entitlements,omitempty"` + // The createTasks field. + CreateTasks *bool `json:"createTasks,omitempty"` // The enabled field. Enabled *bool `json:"enabled,omitempty"` } @@ -20,6 +22,13 @@ func (o *SetBundleAutomationRequest) GetBundleAutomationRuleEntitlement() *Bundl return o.BundleAutomationRuleEntitlement } +func (o *SetBundleAutomationRequest) GetCreateTasks() *bool { + if o == nil { + return nil + } + return o.CreateTasks +} + func (o *SetBundleAutomationRequest) GetEnabled() *bool { if o == nil { return nil diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/status.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/status.go new file mode 100644 index 00000000..cd361c23 --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/status.go @@ -0,0 +1,80 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +import ( + "github.com/conductorone/conductorone-sdk-go/pkg/utils" +) + +// Details - Contains an arbitrary serialized message along with a @type that describes the type of the serialized message. +type Details struct { + // The type of the serialized message. + AtType *string `json:"@type,omitempty"` + AdditionalProperties map[string]any `additionalProperties:"true" json:"-"` +} + +func (d Details) MarshalJSON() ([]byte, error) { + return utils.MarshalJSON(d, "", false) +} + +func (d *Details) UnmarshalJSON(data []byte) error { + if err := utils.UnmarshalJSON(data, &d, "", false, false); err != nil { + return err + } + return nil +} + +func (o *Details) GetAtType() *string { + if o == nil { + return nil + } + return o.AtType +} + +func (o *Details) GetAdditionalProperties() map[string]any { + if o == nil { + return nil + } + return o.AdditionalProperties +} + +// Status - The `Status` type defines a logical error model that is suitable for +// +// different programming environments, including REST APIs and RPC APIs. It is +// used by [gRPC](https://github.com/grpc). Each `Status` message contains +// three pieces of data: error code, error message, and error details. +// +// You can find out more about this error model and how to work with it in the +// [API Design Guide](https://cloud.google.com/apis/design/errors). +type Status struct { + // The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. + Code *int `json:"code,omitempty"` + // A list of messages that carry the error details. There is a common set of + // message types for APIs to use. + Details []Details `json:"details,omitempty"` + // A developer-facing error message, which should be in English. Any + // user-facing error message should be localized and sent in the + // [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client. + Message *string `json:"message,omitempty"` +} + +func (o *Status) GetCode() *int { + if o == nil { + return nil + } + return o.Code +} + +func (o *Status) GetDetails() []Details { + if o == nil { + return nil + } + return o.Details +} + +func (o *Status) GetMessage() *string { + if o == nil { + return nil + } + return o.Message +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/task.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/task.go index 56e99632..1d6c1b36 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/task.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/task.go @@ -127,6 +127,25 @@ func (o *Annotations) GetAdditionalProperties() map[string]any { return o.AdditionalProperties } +// Origin - The origin field. +type Origin string + +const ( + OriginTaskOriginUnspecified Origin = "TASK_ORIGIN_UNSPECIFIED" + OriginTaskOriginProfileMembershipAutomation Origin = "TASK_ORIGIN_PROFILE_MEMBERSHIP_AUTOMATION" + OriginTaskOriginSlack Origin = "TASK_ORIGIN_SLACK" + OriginTaskOriginAPIRequest Origin = "TASK_ORIGIN_API_REQUEST" + OriginTaskOriginJira Origin = "TASK_ORIGIN_JIRA" + OriginTaskOriginCopilot Origin = "TASK_ORIGIN_COPILOT" + OriginTaskOriginWebappRequest Origin = "TASK_ORIGIN_WEBAPP_REQUEST" + OriginTaskOriginTimeRevoke Origin = "TASK_ORIGIN_TIME_REVOKE" + OriginTaskOriginNonUsageRevoke Origin = "TASK_ORIGIN_NON_USAGE_REVOKE" +) + +func (e Origin) ToPointer() *Origin { + return &e +} + // Processing - The processing state of a task as defined by the `processing_enum` type Processing string @@ -207,6 +226,8 @@ type Task struct { InsightIds []string `json:"insightIds,omitempty"` // A human-usable numeric ID of a task which can be included in place of the fully qualified task id in path parmeters (but not search queries). NumericID *int64 `integer:"string" json:"numericId,omitempty"` + // The origin field. + Origin *Origin `json:"origin,omitempty"` // The policy generation id refers to the current policy's generation ID. This is changed when the policy is changed on a task. PolicyGenerationID *string `json:"policyGenerationId,omitempty"` // The processing state of a task as defined by the `processing_enum` @@ -345,6 +366,13 @@ func (o *Task) GetNumericID() *int64 { return o.NumericID } +func (o *Task) GetOrigin() *Origin { + if o == nil { + return nil + } + return o.Origin +} + func (o *Task) GetPolicyGenerationID() *string { if o == nil { return nil diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/tasksearchrequest.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/tasksearchrequest.go index 481eac3f..57a82729 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/tasksearchrequest.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/tasksearchrequest.go @@ -144,6 +144,8 @@ type TaskSearchRequest struct { EmergencyStatus *EmergencyStatus `json:"emergencyStatus,omitempty"` // Search tasks that do not have any of these app entitlement IDs. ExcludeAppEntitlementIds []string `json:"excludeAppEntitlementIds,omitempty"` + // Search tasks that do not have any of these app resource type IDs. + ExcludeAppResourceTypeIds []string `json:"excludeAppResourceTypeIds,omitempty"` // Exclude Specific TaskIDs from this serach result. ExcludeIds []string `json:"excludeIds,omitempty"` // Whether or not to include deleted tasks. @@ -296,6 +298,13 @@ func (o *TaskSearchRequest) GetExcludeAppEntitlementIds() []string { return o.ExcludeAppEntitlementIds } +func (o *TaskSearchRequest) GetExcludeAppResourceTypeIds() []string { + if o == nil { + return nil + } + return o.ExcludeAppResourceTypeIds +} + func (o *TaskSearchRequest) GetExcludeIds() []string { if o == nil { return nil diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/testsourceiprequest.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/testsourceiprequest.go new file mode 100644 index 00000000..39d25d0f --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/testsourceiprequest.go @@ -0,0 +1,25 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// The TestSourceIPRequest message. +type TestSourceIPRequest struct { + // The allowCidr field. + AllowCidr []string `json:"allowCidr,omitempty"` + // if unset, uses the source IP of the request + SourceIP *string `json:"sourceIp,omitempty"` +} + +func (o *TestSourceIPRequest) GetAllowCidr() []string { + if o == nil { + return nil + } + return o.AllowCidr +} + +func (o *TestSourceIPRequest) GetSourceIP() *string { + if o == nil { + return nil + } + return o.SourceIP +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/testsourceipresponse.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/testsourceipresponse.go new file mode 100644 index 00000000..4510297d --- /dev/null +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/testsourceipresponse.go @@ -0,0 +1,40 @@ +// Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. + +package shared + +// The TestSourceIPResponse message. +type TestSourceIPResponse struct { + // The `Status` type defines a logical error model that is suitable for + // different programming environments, including REST APIs and RPC APIs. It is + // used by [gRPC](https://github.com/grpc). Each `Status` message contains + // three pieces of data: error code, error message, and error details. + // + // You can find out more about this error model and how to work with it in the + // [API Design Guide](https://cloud.google.com/apis/design/errors). + Status *Status `json:"details,omitempty"` + // The allowed field. + Allowed *bool `json:"allowed,omitempty"` + // The checkedIp field. + CheckedIP *string `json:"checkedIp,omitempty"` +} + +func (o *TestSourceIPResponse) GetStatus() *Status { + if o == nil { + return nil + } + return o.Status +} + +func (o *TestSourceIPResponse) GetAllowed() *bool { + if o == nil { + return nil + } + return o.Allowed +} + +func (o *TestSourceIPResponse) GetCheckedIP() *string { + if o == nil { + return nil + } + return o.CheckedIP +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/utils/utils.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/utils/utils.go index adb2f705..f1ff9e0a 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/utils/utils.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/utils/utils.go @@ -3,10 +3,12 @@ package utils import ( + "bytes" "context" "fmt" "io" "math/big" + "net/http" "reflect" "regexp" "strconv" @@ -228,3 +230,15 @@ func contains(arr []string, str string) bool { } return false } + +func ConsumeRawBody(res *http.Response) ([]byte, error) { + rawBody, err := io.ReadAll(res.Body) + if err != nil { + return nil, fmt.Errorf("error reading response body: %w", err) + } + + res.Body.Close() + res.Body = io.NopCloser(bytes.NewBuffer(rawBody)) + + return rawBody, nil +} diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/policies.go b/vendor/github.com/conductorone/conductorone-sdk-go/policies.go index 6cfeaa54..16180453 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/policies.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/policies.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *Policies) Create(ctx context.Context, request *shared.CreatePolicyReque RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *Policies) Create(ctx context.Context, request *shared.CreatePolicyReque res.CreatePolicyResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -376,21 +362,11 @@ func (s *Policies) Delete(ctx context.Context, request operations.C1APIPolicyV1P RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -402,28 +378,25 @@ func (s *Policies) Delete(ctx context.Context, request operations.C1APIPolicyV1P res.DeletePolicyResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -572,21 +545,11 @@ func (s *Policies) Get(ctx context.Context, request operations.C1APIPolicyV1Poli RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -598,28 +561,25 @@ func (s *Policies) Get(ctx context.Context, request operations.C1APIPolicyV1Poli res.GetPolicyResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -772,21 +732,11 @@ func (s *Policies) List(ctx context.Context, request operations.C1APIPolicyV1Pol RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -798,28 +748,25 @@ func (s *Policies) List(ctx context.Context, request operations.C1APIPolicyV1Pol res.ListPolicyResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -974,21 +921,11 @@ func (s *Policies) Update(ctx context.Context, request operations.C1APIPolicyV1P RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1000,28 +937,25 @@ func (s *Policies) Update(ctx context.Context, request operations.C1APIPolicyV1P res.UpdatePolicyResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/policysearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/policysearch.go index 9a6e6f09..ffc73ee2 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/policysearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/policysearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *PolicySearch) Search(ctx context.Context, request *shared.SearchPolicie RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *PolicySearch) Search(ctx context.Context, request *shared.SearchPolicie res.ListPolicyResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/policyvalidate.go b/vendor/github.com/conductorone/conductorone-sdk-go/policyvalidate.go index 4822bcb1..d2314c91 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/policyvalidate.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/policyvalidate.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *PolicyValidate) ValidateCEL(ctx context.Context, request *shared.Valida RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *PolicyValidate) ValidateCEL(ctx context.Context, request *shared.Valida res.ValidatePolicyCELResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/requestcatalogmanagement.go b/vendor/github.com/conductorone/conductorone-sdk-go/requestcatalogmanagement.go index b63cb4c5..81ab78f8 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/requestcatalogmanagement.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/requestcatalogmanagement.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *RequestCatalogManagement) AddAccessEntitlements(ctx context.Context, re RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *RequestCatalogManagement) AddAccessEntitlements(ctx context.Context, re res.RequestCatalogManagementServiceAddAccessEntitlementsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -376,21 +362,11 @@ func (s *RequestCatalogManagement) AddAppEntitlements(ctx context.Context, reque RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -402,28 +378,25 @@ func (s *RequestCatalogManagement) AddAppEntitlements(ctx context.Context, reque res.RequestCatalogManagementServiceAddAppEntitlementsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -578,21 +551,11 @@ func (s *RequestCatalogManagement) Create(ctx context.Context, request *shared.R RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -604,28 +567,25 @@ func (s *RequestCatalogManagement) Create(ctx context.Context, request *shared.R res.RequestCatalogManagementServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -780,21 +740,11 @@ func (s *RequestCatalogManagement) Delete(ctx context.Context, request operation RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -806,28 +756,25 @@ func (s *RequestCatalogManagement) Delete(ctx context.Context, request operation res.RequestCatalogManagementServiceDeleteResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -982,21 +929,11 @@ func (s *RequestCatalogManagement) ForceRunBundleAutomation(ctx context.Context, RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1008,28 +945,25 @@ func (s *RequestCatalogManagement) ForceRunBundleAutomation(ctx context.Context, res.ForceRunBundleAutomationResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1178,21 +1112,11 @@ func (s *RequestCatalogManagement) Get(ctx context.Context, request operations.C RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1204,28 +1128,25 @@ func (s *RequestCatalogManagement) Get(ctx context.Context, request operations.C res.RequestCatalogManagementServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1374,21 +1295,11 @@ func (s *RequestCatalogManagement) GetBundleAutomation(ctx context.Context, requ RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1400,28 +1311,25 @@ func (s *RequestCatalogManagement) GetBundleAutomation(ctx context.Context, requ res.BundleAutomation = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1574,21 +1482,11 @@ func (s *RequestCatalogManagement) List(ctx context.Context, request operations. RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1600,28 +1498,25 @@ func (s *RequestCatalogManagement) List(ctx context.Context, request operations. res.RequestCatalogManagementServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1774,21 +1669,11 @@ func (s *RequestCatalogManagement) ListEntitlementsForAccess(ctx context.Context RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1800,28 +1685,25 @@ func (s *RequestCatalogManagement) ListEntitlementsForAccess(ctx context.Context res.RequestCatalogManagementServiceListEntitlementsForAccessResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1974,21 +1856,11 @@ func (s *RequestCatalogManagement) ListEntitlementsPerCatalog(ctx context.Contex RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -2000,28 +1872,25 @@ func (s *RequestCatalogManagement) ListEntitlementsPerCatalog(ctx context.Contex res.RequestCatalogManagementServiceListEntitlementsPerCatalogResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -2176,21 +2045,11 @@ func (s *RequestCatalogManagement) RemoveAccessEntitlements(ctx context.Context, RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -2202,28 +2061,25 @@ func (s *RequestCatalogManagement) RemoveAccessEntitlements(ctx context.Context, res.RequestCatalogManagementServiceRemoveAccessEntitlementsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -2378,21 +2234,11 @@ func (s *RequestCatalogManagement) RemoveAppEntitlements(ctx context.Context, re RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -2404,28 +2250,25 @@ func (s *RequestCatalogManagement) RemoveAppEntitlements(ctx context.Context, re res.RequestCatalogManagementServiceRemoveAppEntitlementsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -2580,21 +2423,11 @@ func (s *RequestCatalogManagement) SetBundleAutomation(ctx context.Context, requ RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -2606,28 +2439,25 @@ func (s *RequestCatalogManagement) SetBundleAutomation(ctx context.Context, requ res.BundleAutomation = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -2782,21 +2612,11 @@ func (s *RequestCatalogManagement) Update(ctx context.Context, request operation RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -2808,28 +2628,25 @@ func (s *RequestCatalogManagement) Update(ctx context.Context, request operation res.RequestCatalogManagementServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/requestcatalogsearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/requestcatalogsearch.go index 010f0391..fb85c8f5 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/requestcatalogsearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/requestcatalogsearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *RequestCatalogSearch) SearchEntitlements(ctx context.Context, request * RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *RequestCatalogSearch) SearchEntitlements(ctx context.Context, request * res.RequestCatalogSearchServiceSearchEntitlementsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/roles.go b/vendor/github.com/conductorone/conductorone-sdk-go/roles.go index 38ddcb72..f41a2e65 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/roles.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/roles.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -168,21 +167,11 @@ func (s *Roles) Get(ctx context.Context, request operations.C1APIIamV1RolesGetRe RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -194,28 +183,25 @@ func (s *Roles) Get(ctx context.Context, request operations.C1APIIamV1RolesGetRe res.GetRolesResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -368,21 +354,11 @@ func (s *Roles) List(ctx context.Context, request operations.C1APIIamV1RolesList RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -394,28 +370,25 @@ func (s *Roles) List(ctx context.Context, request operations.C1APIIamV1RolesList res.ListRolesResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -570,21 +543,11 @@ func (s *Roles) Update(ctx context.Context, request operations.C1APIIamV1RolesUp RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -596,28 +559,25 @@ func (s *Roles) Update(ctx context.Context, request operations.C1APIIamV1RolesUp res.UpdateRolesResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/sessionsettings.go b/vendor/github.com/conductorone/conductorone-sdk-go/sessionsettings.go index 5c5e62f0..95dfd57d 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/sessionsettings.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/sessionsettings.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -168,54 +167,230 @@ func (s *SessionSettings) Get(ctx context.Context, opts ...operations.Option) (* RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) + switch { + case httpRes.StatusCode == 200: + switch { + case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + + var out shared.GetSessionSettingsResponse + if err := utils.UnmarshalJsonFromResponseBody(bytes.NewBuffer(rawBody), &out, ""); err != nil { + return nil, err + } + + res.GetSessionSettingsResponse = &out + default: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) + } + case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: + fallthrough + case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) + return nil, err + } + return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) + default: + rawBody, err := utils.ConsumeRawBody(httpRes) + if err != nil { + return nil, err + } + return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) + } + + return res, nil + +} + +// TestSourceIP - Test Source Ip +// Invokes the c1.api.settings.v1.SessionSettingsService.TestSourceIP method. +func (s *SessionSettings) TestSourceIP(ctx context.Context, request *shared.TestSourceIPRequest, opts ...operations.Option) (*operations.C1APISettingsV1SessionSettingsServiceTestSourceIPResponse, error) { + hookCtx := hooks.HookContext{ + Context: ctx, + OperationID: "c1.api.settings.v1.SessionSettingsService.TestSourceIP", + OAuth2Scopes: []string{}, + SecuritySource: s.sdkConfiguration.Security, + } + + o := operations.Options{} + supportedOptions := []string{ + operations.SupportedOptionRetries, + operations.SupportedOptionTimeout, + } + + for _, opt := range opts { + if err := opt(&o, supportedOptions...); err != nil { + return nil, fmt.Errorf("error applying option: %w", err) } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil + } + + baseURL := utils.ReplaceParameters(s.sdkConfiguration.GetServerDetails()) + opURL, err := url.JoinPath(baseURL, "/api/v1/settings/session/test-source-ip") + if err != nil { + return nil, fmt.Errorf("error generating URL: %w", err) + } + + bodyReader, reqContentType, err := utils.SerializeRequestBody(ctx, request, false, true, "Request", "json", `request:"mediaType=application/json"`) + if err != nil { + return nil, err + } + + timeout := o.Timeout + if timeout == nil { + timeout = s.sdkConfiguration.Timeout + } + + if timeout != nil { + var cancel context.CancelFunc + ctx, cancel = context.WithTimeout(ctx, *timeout) + defer cancel() + } + + req, err := http.NewRequestWithContext(ctx, "POST", opURL, bodyReader) + if err != nil { + return nil, fmt.Errorf("error creating request: %w", err) + } + req.Header.Set("Accept", "application/json") + req.Header.Set("User-Agent", s.sdkConfiguration.UserAgent) + req.Header.Set("Content-Type", reqContentType) + + if err := utils.PopulateSecurity(ctx, req, s.sdkConfiguration.Security); err != nil { + return nil, err + } + + globalRetryConfig := s.sdkConfiguration.RetryConfig + retryConfig := o.Retries + if retryConfig == nil { + if globalRetryConfig != nil { + retryConfig = globalRetryConfig + } + } + + var httpRes *http.Response + if retryConfig != nil { + httpRes, err = utils.Retry(ctx, utils.Retries{ + Config: retryConfig, + StatusCodes: []string{ + "429", + "500", + "502", + "503", + "504", + }, + }, func() (*http.Response, error) { + if req.Body != nil { + copyBody, err := req.GetBody() + if err != nil { + return nil, err + } + req.Body = copyBody + } + + req, err = s.sdkConfiguration.Hooks.BeforeRequest(hooks.BeforeRequestContext{HookContext: hookCtx}, req) + if err != nil { + return nil, backoff.Permanent(err) + } + + httpRes, err := s.sdkConfiguration.Client.Do(req) + if err != nil || httpRes == nil { + if err != nil { + err = fmt.Errorf("error sending request: %w", err) + } else { + err = fmt.Errorf("error sending request: no response") + } + + _, err = s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, nil, err) + } + return httpRes, err + }) + + if err != nil { + return nil, err + } else { + httpRes, err = s.sdkConfiguration.Hooks.AfterSuccess(hooks.AfterSuccessContext{HookContext: hookCtx}, httpRes) + if err != nil { + return nil, err + } + } + } else { + req, err = s.sdkConfiguration.Hooks.BeforeRequest(hooks.BeforeRequestContext{HookContext: hookCtx}, req) + if err != nil { + return nil, err + } + + httpRes, err = s.sdkConfiguration.Client.Do(req) + if err != nil || httpRes == nil { + if err != nil { + err = fmt.Errorf("error sending request: %w", err) + } else { + err = fmt.Errorf("error sending request: no response") + } + + _, err = s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, nil, err) + return nil, err + } else if utils.MatchStatusCodes([]string{"4XX", "5XX"}, httpRes.StatusCode) { + _httpRes, err := s.sdkConfiguration.Hooks.AfterError(hooks.AfterErrorContext{HookContext: hookCtx}, httpRes, nil) + if err != nil { + return nil, err + } else if _httpRes != nil { + httpRes = _httpRes + } + } else { + httpRes, err = s.sdkConfiguration.Hooks.AfterSuccess(hooks.AfterSuccessContext{HookContext: hookCtx}, httpRes) + if err != nil { + return nil, err + } + } + } + + res := &operations.C1APISettingsV1SessionSettingsServiceTestSourceIPResponse{ + StatusCode: httpRes.StatusCode, + ContentType: httpRes.Header.Get("Content-Type"), + RawResponse: httpRes, } switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - var out shared.GetSessionSettingsResponse + var out shared.TestSourceIPResponse if err := utils.UnmarshalJsonFromResponseBody(bytes.NewBuffer(rawBody), &out, ""); err != nil { return nil, err } - res.GetSessionSettingsResponse = &out + res.TestSourceIPResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -370,21 +545,11 @@ func (s *SessionSettings) Update(ctx context.Context, request *shared.UpdateSess RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -396,28 +561,25 @@ func (s *SessionSettings) Update(ctx context.Context, request *shared.UpdateSess res.UpdateSessionSettingsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/systemlog.go b/vendor/github.com/conductorone/conductorone-sdk-go/systemlog.go index 267d077d..683c540d 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/systemlog.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/systemlog.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -177,21 +176,11 @@ func (s *SystemLog) ListEvents(ctx context.Context, request *shared.SystemLogSer RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -203,28 +192,25 @@ func (s *SystemLog) ListEvents(ctx context.Context, request *shared.SystemLogSer res.SystemLogServiceListEventsResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/task.go b/vendor/github.com/conductorone/conductorone-sdk-go/task.go index c84e6c07..0985e7ce 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/task.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/task.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *Task) CreateGrantTask(ctx context.Context, request *shared.TaskServiceC RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *Task) CreateGrantTask(ctx context.Context, request *shared.TaskServiceC res.TaskServiceCreateGrantResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -376,21 +362,11 @@ func (s *Task) CreateOffboardingTask(ctx context.Context, request *shared.TaskSe RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -402,28 +378,25 @@ func (s *Task) CreateOffboardingTask(ctx context.Context, request *shared.TaskSe res.TaskServiceCreateOffboardingResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -578,21 +551,11 @@ func (s *Task) CreateRevokeTask(ctx context.Context, request *shared.TaskService RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -604,28 +567,25 @@ func (s *Task) CreateRevokeTask(ctx context.Context, request *shared.TaskService res.TaskServiceCreateRevokeResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -774,21 +734,11 @@ func (s *Task) Get(ctx context.Context, request operations.C1APITaskV1TaskServic RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -800,28 +750,25 @@ func (s *Task) Get(ctx context.Context, request operations.C1APITaskV1TaskServic res.TaskServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/taskactions.go b/vendor/github.com/conductorone/conductorone-sdk-go/taskactions.go index c4faeda5..5e4c1ef6 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/taskactions.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/taskactions.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" ) @@ -173,21 +172,11 @@ func (s *TaskActions) Approve(ctx context.Context, request operations.C1APITaskV RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -199,28 +188,25 @@ func (s *TaskActions) Approve(ctx context.Context, request operations.C1APITaskV res.TaskActionsServiceApproveResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -375,21 +361,11 @@ func (s *TaskActions) Comment(ctx context.Context, request operations.C1APITaskV RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -401,28 +377,25 @@ func (s *TaskActions) Comment(ctx context.Context, request operations.C1APITaskV res.TaskActionsServiceCommentResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -577,21 +550,11 @@ func (s *TaskActions) Deny(ctx context.Context, request operations.C1APITaskV1Ta RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -603,28 +566,25 @@ func (s *TaskActions) Deny(ctx context.Context, request operations.C1APITaskV1Ta res.TaskActionsServiceDenyResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -779,21 +739,11 @@ func (s *TaskActions) EscalateToEmergencyAccess(ctx context.Context, request ope RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -805,28 +755,25 @@ func (s *TaskActions) EscalateToEmergencyAccess(ctx context.Context, request ope res.TaskServiceActionResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -981,21 +928,11 @@ func (s *TaskActions) HardReset(ctx context.Context, request operations.C1APITas RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1007,28 +944,25 @@ func (s *TaskActions) HardReset(ctx context.Context, request operations.C1APITas res.TaskActionsServiceHardResetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1183,21 +1117,11 @@ func (s *TaskActions) Reassign(ctx context.Context, request operations.C1APITask RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1209,28 +1133,25 @@ func (s *TaskActions) Reassign(ctx context.Context, request operations.C1APITask res.TaskActionsServiceReassignResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1385,21 +1306,11 @@ func (s *TaskActions) Restart(ctx context.Context, request operations.C1APITaskV RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1411,28 +1322,25 @@ func (s *TaskActions) Restart(ctx context.Context, request operations.C1APITaskV res.TaskActionsServiceRestartResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/tasksearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/tasksearch.go index 422e4f28..bf0ab15c 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/tasksearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/tasksearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *TaskSearch) Search(ctx context.Context, request *shared.TaskSearchReque RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *TaskSearch) Search(ctx context.Context, request *shared.TaskSearchReque res.TaskSearchResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/user.go b/vendor/github.com/conductorone/conductorone-sdk-go/user.go index d8679af3..87ec412a 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/user.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/user.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -168,21 +167,11 @@ func (s *User) Get(ctx context.Context, request operations.C1APIUserV1UserServic RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -194,28 +183,25 @@ func (s *User) Get(ctx context.Context, request operations.C1APIUserV1UserServic res.UserServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -368,21 +354,11 @@ func (s *User) List(ctx context.Context, request operations.C1APIUserV1UserServi RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -394,28 +370,25 @@ func (s *User) List(ctx context.Context, request operations.C1APIUserV1UserServi res.UserServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/usersearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/usersearch.go index aaf73af0..8ff07f67 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/usersearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/usersearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *UserSearch) Search(ctx context.Context, request *shared.SearchUsersRequ RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *UserSearch) Search(ctx context.Context, request *shared.SearchUsersRequ res.SearchUsersResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/webhooks.go b/vendor/github.com/conductorone/conductorone-sdk-go/webhooks.go index 25eb5a45..7b62a677 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/webhooks.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/webhooks.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *Webhooks) Create(ctx context.Context, request *shared.WebhooksServiceCr RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *Webhooks) Create(ctx context.Context, request *shared.WebhooksServiceCr res.WebhooksServiceCreateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -376,21 +362,11 @@ func (s *Webhooks) Delete(ctx context.Context, request operations.C1APIWebhooksV RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -402,28 +378,25 @@ func (s *Webhooks) Delete(ctx context.Context, request operations.C1APIWebhooksV res.WebhooksServiceDeleteResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -572,21 +545,11 @@ func (s *Webhooks) Get(ctx context.Context, request operations.C1APIWebhooksV1We RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -598,28 +561,25 @@ func (s *Webhooks) Get(ctx context.Context, request operations.C1APIWebhooksV1We res.WebhooksServiceGetResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -772,21 +732,11 @@ func (s *Webhooks) List(ctx context.Context, request operations.C1APIWebhooksV1W RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -798,28 +748,25 @@ func (s *Webhooks) List(ctx context.Context, request operations.C1APIWebhooksV1W res.WebhooksServiceListResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -974,21 +921,11 @@ func (s *Webhooks) Test(ctx context.Context, request operations.C1APIWebhooksV1W RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1000,28 +937,25 @@ func (s *Webhooks) Test(ctx context.Context, request operations.C1APIWebhooksV1W res.WebhooksServiceTestResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } @@ -1176,21 +1110,11 @@ func (s *Webhooks) Update(ctx context.Context, request operations.C1APIWebhooksV RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -1202,28 +1126,25 @@ func (s *Webhooks) Update(ctx context.Context, request operations.C1APIWebhooksV res.WebhooksServiceUpdateResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/webhookssearch.go b/vendor/github.com/conductorone/conductorone-sdk-go/webhookssearch.go index 394b7186..e10a4dad 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/webhookssearch.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/webhookssearch.go @@ -12,7 +12,6 @@ import ( "github.com/conductorone/conductorone-sdk-go/pkg/models/sdkerrors" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" "github.com/conductorone/conductorone-sdk-go/pkg/utils" - "io" "net/http" "net/url" ) @@ -174,21 +173,11 @@ func (s *WebhooksSearch) Search(ctx context.Context, request *shared.WebhooksSea RawResponse: httpRes, } - getRawBody := func() ([]byte, error) { - rawBody, err := io.ReadAll(httpRes.Body) - if err != nil { - return nil, fmt.Errorf("error reading response body: %w", err) - } - httpRes.Body.Close() - httpRes.Body = io.NopCloser(bytes.NewBuffer(rawBody)) - return rawBody, nil - } - switch { case httpRes.StatusCode == 200: switch { case utils.MatchContentType(httpRes.Header.Get("Content-Type"), `application/json`): - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } @@ -200,28 +189,25 @@ func (s *WebhooksSearch) Search(ctx context.Context, request *shared.WebhooksSea res.WebhooksSearchResponse = &out default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError(fmt.Sprintf("unknown content-type received: %s", httpRes.Header.Get("Content-Type")), httpRes.StatusCode, string(rawBody), httpRes) } case httpRes.StatusCode >= 400 && httpRes.StatusCode < 500: fallthrough case httpRes.StatusCode >= 500 && httpRes.StatusCode < 600: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("API error occurred", httpRes.StatusCode, string(rawBody), httpRes) default: - rawBody, err := getRawBody() + rawBody, err := utils.ConsumeRawBody(httpRes) if err != nil { return nil, err } - return nil, sdkerrors.NewSDKError("unknown status code returned", httpRes.StatusCode, string(rawBody), httpRes) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 6fba253f..57697d67 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -28,7 +28,7 @@ github.com/cenkalti/backoff/v4 github.com/conductorone/baton-sdk/pb/c1/connector/v2 github.com/conductorone/baton-sdk/pkg/crypto/providers github.com/conductorone/baton-sdk/pkg/crypto/providers/jwk -# github.com/conductorone/conductorone-sdk-go v1.21.1-0.20241009214436-e388bb33c02f +# github.com/conductorone/conductorone-sdk-go v1.22.0 ## explicit; go 1.21 github.com/conductorone/conductorone-sdk-go github.com/conductorone/conductorone-sdk-go/internal/hooks