From fac481bad16a70987661428ac4f1a3e905be0f9f Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 17:33:59 +0000 Subject: [PATCH] feat(api): api update (#3658) --- .stats.yml | 4 +- api.md | 6 - zero_trust/devicepolicy.go | 10 -- zero_trust/devicepolicydefaultcertificate.go | 138 ------------------ .../devicepolicydefaultcertificate_test.go | 69 --------- 5 files changed, 2 insertions(+), 225 deletions(-) delete mode 100644 zero_trust/devicepolicydefaultcertificate_test.go diff --git a/.stats.yml b/.stats.yml index e163d63cd95..1ea0a9a80c1 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,2 +1,2 @@ -configured_endpoints: 1451 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-811ce6b3fb37e41c31b89ac40edb0f29791c03499a00e728955e3a317e664d82.yml +configured_endpoints: 1449 +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-65fb65b2114a872dda4e29b09cb0b33ea5fa3060819757a6c7a93bcc1a3a3422.yml diff --git a/api.md b/api.md index a900169279a..c9fda55da2a 100644 --- a/api.md +++ b/api.md @@ -4531,7 +4531,6 @@ Methods: Params Types: -- zero_trust.DevicePolicyCertificatesParam - zero_trust.FallbackDomainParam - zero_trust.SplitTunnelExcludeParam - zero_trust.SplitTunnelIncludeParam @@ -4578,11 +4577,6 @@ Methods: ##### Certificates -Methods: - -- client.ZeroTrust.Devices.Policies.Default.Certificates.Edit(ctx context.Context, zoneTag string, body zero_trust.DevicePolicyDefaultCertificateEditParams) (interface{}, error) -- client.ZeroTrust.Devices.Policies.Default.Certificates.Get(ctx context.Context, zoneTag string) (interface{}, error) - #### Custom Methods: diff --git a/zero_trust/devicepolicy.go b/zero_trust/devicepolicy.go index f3d1e6fc2b9..8e535c627ec 100644 --- a/zero_trust/devicepolicy.go +++ b/zero_trust/devicepolicy.go @@ -31,16 +31,6 @@ func NewDevicePolicyService(opts ...option.RequestOption) (r *DevicePolicyServic return } -type DevicePolicyCertificatesParam struct { - // The current status of the device policy certificate provisioning feature for - // WARP clients. - Enabled param.Field[bool] `json:"enabled,required"` -} - -func (r DevicePolicyCertificatesParam) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r) -} - type FallbackDomain struct { // The domain suffix to match when resolving locally. Suffix string `json:"suffix,required"` diff --git a/zero_trust/devicepolicydefaultcertificate.go b/zero_trust/devicepolicydefaultcertificate.go index bc62c947a1f..eb7f72ed997 100644 --- a/zero_trust/devicepolicydefaultcertificate.go +++ b/zero_trust/devicepolicydefaultcertificate.go @@ -3,15 +3,7 @@ package zero_trust import ( - "context" - "errors" - "fmt" - "net/http" - - "github.com/cloudflare/cloudflare-go/v3/internal/apijson" - "github.com/cloudflare/cloudflare-go/v3/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v3/option" - "github.com/cloudflare/cloudflare-go/v3/shared" ) // DevicePolicyDefaultCertificateService contains methods and other services that @@ -32,133 +24,3 @@ func NewDevicePolicyDefaultCertificateService(opts ...option.RequestOption) (r * r.Options = opts return } - -// Enable Zero Trust Clients to provision a certificate, containing a x509 subject, -// and referenced by Access device posture policies when the client visits MTLS -// protected domains. This facilitates device posture without a WARP session. -func (r *DevicePolicyDefaultCertificateService) Edit(ctx context.Context, zoneTag string, body DevicePolicyDefaultCertificateEditParams, opts ...option.RequestOption) (res *interface{}, err error) { - var env DevicePolicyDefaultCertificateEditResponseEnvelope - opts = append(r.Options[:], opts...) - if zoneTag == "" { - err = errors.New("missing required zone_tag parameter") - return - } - path := fmt.Sprintf("zones/%s/devices/policy/certificates", zoneTag) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodPatch, path, body, &env, opts...) - if err != nil { - return - } - res = &env.Result - return -} - -// Fetches device certificate provisioning -func (r *DevicePolicyDefaultCertificateService) Get(ctx context.Context, zoneTag string, opts ...option.RequestOption) (res *interface{}, err error) { - var env DevicePolicyDefaultCertificateGetResponseEnvelope - opts = append(r.Options[:], opts...) - if zoneTag == "" { - err = errors.New("missing required zone_tag parameter") - return - } - path := fmt.Sprintf("zones/%s/devices/policy/certificates", zoneTag) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodGet, path, nil, &env, opts...) - if err != nil { - return - } - res = &env.Result - return -} - -type DevicePolicyDefaultCertificateEditParams struct { - DevicePolicyCertificates DevicePolicyCertificatesParam `json:"device_policy_certificates,required"` -} - -func (r DevicePolicyDefaultCertificateEditParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.DevicePolicyCertificates) -} - -type DevicePolicyDefaultCertificateEditResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result interface{} `json:"result,required"` - // Whether the API call was successful. - Success DevicePolicyDefaultCertificateEditResponseEnvelopeSuccess `json:"success,required"` - JSON devicePolicyDefaultCertificateEditResponseEnvelopeJSON `json:"-"` -} - -// devicePolicyDefaultCertificateEditResponseEnvelopeJSON contains the JSON -// metadata for the struct [DevicePolicyDefaultCertificateEditResponseEnvelope] -type devicePolicyDefaultCertificateEditResponseEnvelopeJSON struct { - Errors apijson.Field - Messages apijson.Field - Result apijson.Field - Success apijson.Field - raw string - ExtraFields map[string]apijson.Field -} - -func (r *DevicePolicyDefaultCertificateEditResponseEnvelope) UnmarshalJSON(data []byte) (err error) { - return apijson.UnmarshalRoot(data, r) -} - -func (r devicePolicyDefaultCertificateEditResponseEnvelopeJSON) RawJSON() string { - return r.raw -} - -// Whether the API call was successful. -type DevicePolicyDefaultCertificateEditResponseEnvelopeSuccess bool - -const ( - DevicePolicyDefaultCertificateEditResponseEnvelopeSuccessTrue DevicePolicyDefaultCertificateEditResponseEnvelopeSuccess = true -) - -func (r DevicePolicyDefaultCertificateEditResponseEnvelopeSuccess) IsKnown() bool { - switch r { - case DevicePolicyDefaultCertificateEditResponseEnvelopeSuccessTrue: - return true - } - return false -} - -type DevicePolicyDefaultCertificateGetResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result interface{} `json:"result,required"` - // Whether the API call was successful. - Success DevicePolicyDefaultCertificateGetResponseEnvelopeSuccess `json:"success,required"` - JSON devicePolicyDefaultCertificateGetResponseEnvelopeJSON `json:"-"` -} - -// devicePolicyDefaultCertificateGetResponseEnvelopeJSON contains the JSON metadata -// for the struct [DevicePolicyDefaultCertificateGetResponseEnvelope] -type devicePolicyDefaultCertificateGetResponseEnvelopeJSON struct { - Errors apijson.Field - Messages apijson.Field - Result apijson.Field - Success apijson.Field - raw string - ExtraFields map[string]apijson.Field -} - -func (r *DevicePolicyDefaultCertificateGetResponseEnvelope) UnmarshalJSON(data []byte) (err error) { - return apijson.UnmarshalRoot(data, r) -} - -func (r devicePolicyDefaultCertificateGetResponseEnvelopeJSON) RawJSON() string { - return r.raw -} - -// Whether the API call was successful. -type DevicePolicyDefaultCertificateGetResponseEnvelopeSuccess bool - -const ( - DevicePolicyDefaultCertificateGetResponseEnvelopeSuccessTrue DevicePolicyDefaultCertificateGetResponseEnvelopeSuccess = true -) - -func (r DevicePolicyDefaultCertificateGetResponseEnvelopeSuccess) IsKnown() bool { - switch r { - case DevicePolicyDefaultCertificateGetResponseEnvelopeSuccessTrue: - return true - } - return false -} diff --git a/zero_trust/devicepolicydefaultcertificate_test.go b/zero_trust/devicepolicydefaultcertificate_test.go deleted file mode 100644 index fe22377a5da..00000000000 --- a/zero_trust/devicepolicydefaultcertificate_test.go +++ /dev/null @@ -1,69 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package zero_trust_test - -import ( - "context" - "errors" - "os" - "testing" - - "github.com/cloudflare/cloudflare-go/v3" - "github.com/cloudflare/cloudflare-go/v3/internal/testutil" - "github.com/cloudflare/cloudflare-go/v3/option" - "github.com/cloudflare/cloudflare-go/v3/zero_trust" -) - -func TestDevicePolicyDefaultCertificateEdit(t *testing.T) { - baseURL := "http://localhost:4010" - if envURL, ok := os.LookupEnv("TEST_API_BASE_URL"); ok { - baseURL = envURL - } - if !testutil.CheckTestServer(t, baseURL) { - return - } - client := cloudflare.NewClient( - option.WithBaseURL(baseURL), - option.WithAPIKey("144c9defac04969c7bfad8efaa8ea194"), - option.WithAPIEmail("user@example.com"), - ) - _, err := client.ZeroTrust.Devices.Policies.Default.Certificates.Edit( - context.TODO(), - "699d98642c564d2e855e9661899b7252", - zero_trust.DevicePolicyDefaultCertificateEditParams{ - DevicePolicyCertificates: zero_trust.DevicePolicyCertificatesParam{ - Enabled: cloudflare.F(true), - }, - }, - ) - if err != nil { - var apierr *cloudflare.Error - if errors.As(err, &apierr) { - t.Log(string(apierr.DumpRequest(true))) - } - t.Fatalf("err should be nil: %s", err.Error()) - } -} - -func TestDevicePolicyDefaultCertificateGet(t *testing.T) { - baseURL := "http://localhost:4010" - if envURL, ok := os.LookupEnv("TEST_API_BASE_URL"); ok { - baseURL = envURL - } - if !testutil.CheckTestServer(t, baseURL) { - return - } - client := cloudflare.NewClient( - option.WithBaseURL(baseURL), - option.WithAPIKey("144c9defac04969c7bfad8efaa8ea194"), - option.WithAPIEmail("user@example.com"), - ) - _, err := client.ZeroTrust.Devices.Policies.Default.Certificates.Get(context.TODO(), "699d98642c564d2e855e9661899b7252") - if err != nil { - var apierr *cloudflare.Error - if errors.As(err, &apierr) { - t.Log(string(apierr.DumpRequest(true))) - } - t.Fatalf("err should be nil: %s", err.Error()) - } -}