Skip to content

Commit 974bd02

Browse files
stainless-app[bot]stainless-app[bot]
committed
chore(api): update composite API spec
1 parent c5b9c0a commit 974bd02

File tree

13 files changed

+1181
-693
lines changed

13 files changed

+1181
-693
lines changed

‎.stats.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
configured_endpoints: 1894
2-
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-032f0561c841e8879d026e0ff79cc17ba19650c6f4bd8fd034b97aee94f6dd3e.yml
3-
openapi_spec_hash: ccf91ca5627376e5ee88b93957b1d293
2+
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-657785702776bf978e72f56716a4d8447f405a943fc4a62a8c4e1db9d1a588f3.yml
3+
openapi_spec_hash: ea73c204f3ca180efadb9a74e48ae78b
44
config_hash: c7b8d81b439ef7ee4d865bfc67f8f600

‎api.md‎

Lines changed: 20 additions & 25 deletions
Large diffs are not rendered by default.

‎api_gateway/operationschemavalidation.go‎

Lines changed: 80 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (r *OperationSchemaValidationService) Update(ctx context.Context, operation
5959
// Deprecated: Use
6060
// [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/)
6161
// instead.
62-
func (r *OperationSchemaValidationService) Edit(ctx context.Context, params OperationSchemaValidationEditParams, opts ...option.RequestOption) (res *SettingsMultipleRequest, err error) {
62+
func (r *OperationSchemaValidationService) Edit(ctx context.Context, params OperationSchemaValidationEditParams, opts ...option.RequestOption) (res *OperationSchemaValidationEditResponse, err error) {
6363
var env OperationSchemaValidationEditResponseEnvelope
6464
opts = slices.Concat(r.Options, opts)
6565
if params.ZoneID.Value == "" {
@@ -95,10 +95,7 @@ func (r *OperationSchemaValidationService) Get(ctx context.Context, operationID
9595
return
9696
}
9797

98-
type SettingsMultipleRequest map[string]SettingsMultipleRequestItem
99-
100-
// Operation ID to mitigation action mappings
101-
type SettingsMultipleRequestItem struct {
98+
type OperationSchemaValidationUpdateResponse struct {
10299
// When set, this applies a mitigation action to this operation
103100
//
104101
// - `log` log request when request does not conform to schema for this operation
@@ -107,23 +104,26 @@ type SettingsMultipleRequestItem struct {
107104
// - `none` will skip mitigation for this operation
108105
// - `null` indicates that no operation level mitigation is in place, see Zone
109106
// Level Schema Validation Settings for mitigation action that will be applied
110-
MitigationAction SettingsMultipleRequestItemMitigationAction `json:"mitigation_action,nullable"`
111-
JSON settingsMultipleRequestItemJSON `json:"-"`
107+
MitigationAction OperationSchemaValidationUpdateResponseMitigationAction `json:"mitigation_action,nullable"`
108+
// UUID.
109+
OperationID string `json:"operation_id"`
110+
JSON operationSchemaValidationUpdateResponseJSON `json:"-"`
112111
}
113112

114-
// settingsMultipleRequestItemJSON contains the JSON metadata for the struct
115-
// [SettingsMultipleRequestItem]
116-
type settingsMultipleRequestItemJSON struct {
113+
// operationSchemaValidationUpdateResponseJSON contains the JSON metadata for the
114+
// struct [OperationSchemaValidationUpdateResponse]
115+
type operationSchemaValidationUpdateResponseJSON struct {
117116
MitigationAction apijson.Field
117+
OperationID apijson.Field
118118
raw string
119119
ExtraFields map[string]apijson.Field
120120
}
121121

122-
func (r *SettingsMultipleRequestItem) UnmarshalJSON(data []byte) (err error) {
122+
func (r *OperationSchemaValidationUpdateResponse) UnmarshalJSON(data []byte) (err error) {
123123
return apijson.UnmarshalRoot(data, r)
124124
}
125125

126-
func (r settingsMultipleRequestItemJSON) RawJSON() string {
126+
func (r operationSchemaValidationUpdateResponseJSON) RawJSON() string {
127127
return r.raw
128128
}
129129

@@ -135,26 +135,26 @@ func (r settingsMultipleRequestItemJSON) RawJSON() string {
135135
// - `none` will skip mitigation for this operation
136136
// - `null` indicates that no operation level mitigation is in place, see Zone
137137
// Level Schema Validation Settings for mitigation action that will be applied
138-
type SettingsMultipleRequestItemMitigationAction string
138+
type OperationSchemaValidationUpdateResponseMitigationAction string
139139

140140
const (
141-
SettingsMultipleRequestItemMitigationActionLog SettingsMultipleRequestItemMitigationAction = "log"
142-
SettingsMultipleRequestItemMitigationActionBlock SettingsMultipleRequestItemMitigationAction = "block"
143-
SettingsMultipleRequestItemMitigationActionNone SettingsMultipleRequestItemMitigationAction = "none"
141+
OperationSchemaValidationUpdateResponseMitigationActionLog OperationSchemaValidationUpdateResponseMitigationAction = "log"
142+
OperationSchemaValidationUpdateResponseMitigationActionBlock OperationSchemaValidationUpdateResponseMitigationAction = "block"
143+
OperationSchemaValidationUpdateResponseMitigationActionNone OperationSchemaValidationUpdateResponseMitigationAction = "none"
144144
)
145145

146-
func (r SettingsMultipleRequestItemMitigationAction) IsKnown() bool {
146+
func (r OperationSchemaValidationUpdateResponseMitigationAction) IsKnown() bool {
147147
switch r {
148-
case SettingsMultipleRequestItemMitigationActionLog, SettingsMultipleRequestItemMitigationActionBlock, SettingsMultipleRequestItemMitigationActionNone:
148+
case OperationSchemaValidationUpdateResponseMitigationActionLog, OperationSchemaValidationUpdateResponseMitigationActionBlock, OperationSchemaValidationUpdateResponseMitigationActionNone:
149149
return true
150150
}
151151
return false
152152
}
153153

154-
type SettingsMultipleRequestParam map[string]SettingsMultipleRequestItemParam
154+
type OperationSchemaValidationEditResponse map[string]OperationSchemaValidationEditResponseItem
155155

156156
// Operation ID to mitigation action mappings
157-
type SettingsMultipleRequestItemParam struct {
157+
type OperationSchemaValidationEditResponseItem struct {
158158
// When set, this applies a mitigation action to this operation
159159
//
160160
// - `log` log request when request does not conform to schema for this operation
@@ -163,42 +163,23 @@ type SettingsMultipleRequestItemParam struct {
163163
// - `none` will skip mitigation for this operation
164164
// - `null` indicates that no operation level mitigation is in place, see Zone
165165
// Level Schema Validation Settings for mitigation action that will be applied
166-
MitigationAction param.Field[SettingsMultipleRequestItemMitigationAction] `json:"mitigation_action"`
166+
MitigationAction OperationSchemaValidationEditResponseItemMitigationAction `json:"mitigation_action,nullable"`
167+
JSON operationSchemaValidationEditResponseItemJSON `json:"-"`
167168
}
168169

169-
func (r SettingsMultipleRequestItemParam) MarshalJSON() (data []byte, err error) {
170-
return apijson.MarshalRoot(r)
171-
}
172-
173-
type OperationSchemaValidationUpdateResponse struct {
174-
// When set, this applies a mitigation action to this operation
175-
//
176-
// - `log` log request when request does not conform to schema for this operation
177-
// - `block` deny access to the site when request does not conform to schema for
178-
// this operation
179-
// - `none` will skip mitigation for this operation
180-
// - `null` indicates that no operation level mitigation is in place, see Zone
181-
// Level Schema Validation Settings for mitigation action that will be applied
182-
MitigationAction OperationSchemaValidationUpdateResponseMitigationAction `json:"mitigation_action,nullable"`
183-
// UUID.
184-
OperationID string `json:"operation_id"`
185-
JSON operationSchemaValidationUpdateResponseJSON `json:"-"`
186-
}
187-
188-
// operationSchemaValidationUpdateResponseJSON contains the JSON metadata for the
189-
// struct [OperationSchemaValidationUpdateResponse]
190-
type operationSchemaValidationUpdateResponseJSON struct {
170+
// operationSchemaValidationEditResponseItemJSON contains the JSON metadata for the
171+
// struct [OperationSchemaValidationEditResponseItem]
172+
type operationSchemaValidationEditResponseItemJSON struct {
191173
MitigationAction apijson.Field
192-
OperationID apijson.Field
193174
raw string
194175
ExtraFields map[string]apijson.Field
195176
}
196177

197-
func (r *OperationSchemaValidationUpdateResponse) UnmarshalJSON(data []byte) (err error) {
178+
func (r *OperationSchemaValidationEditResponseItem) UnmarshalJSON(data []byte) (err error) {
198179
return apijson.UnmarshalRoot(data, r)
199180
}
200181

201-
func (r operationSchemaValidationUpdateResponseJSON) RawJSON() string {
182+
func (r operationSchemaValidationEditResponseItemJSON) RawJSON() string {
202183
return r.raw
203184
}
204185

@@ -210,17 +191,17 @@ func (r operationSchemaValidationUpdateResponseJSON) RawJSON() string {
210191
// - `none` will skip mitigation for this operation
211192
// - `null` indicates that no operation level mitigation is in place, see Zone
212193
// Level Schema Validation Settings for mitigation action that will be applied
213-
type OperationSchemaValidationUpdateResponseMitigationAction string
194+
type OperationSchemaValidationEditResponseItemMitigationAction string
214195

215196
const (
216-
OperationSchemaValidationUpdateResponseMitigationActionLog OperationSchemaValidationUpdateResponseMitigationAction = "log"
217-
OperationSchemaValidationUpdateResponseMitigationActionBlock OperationSchemaValidationUpdateResponseMitigationAction = "block"
218-
OperationSchemaValidationUpdateResponseMitigationActionNone OperationSchemaValidationUpdateResponseMitigationAction = "none"
197+
OperationSchemaValidationEditResponseItemMitigationActionLog OperationSchemaValidationEditResponseItemMitigationAction = "log"
198+
OperationSchemaValidationEditResponseItemMitigationActionBlock OperationSchemaValidationEditResponseItemMitigationAction = "block"
199+
OperationSchemaValidationEditResponseItemMitigationActionNone OperationSchemaValidationEditResponseItemMitigationAction = "none"
219200
)
220201

221-
func (r OperationSchemaValidationUpdateResponseMitigationAction) IsKnown() bool {
202+
func (r OperationSchemaValidationEditResponseItemMitigationAction) IsKnown() bool {
222203
switch r {
223-
case OperationSchemaValidationUpdateResponseMitigationActionLog, OperationSchemaValidationUpdateResponseMitigationActionBlock, OperationSchemaValidationUpdateResponseMitigationActionNone:
204+
case OperationSchemaValidationEditResponseItemMitigationActionLog, OperationSchemaValidationEditResponseItemMitigationActionBlock, OperationSchemaValidationEditResponseItemMitigationActionNone:
224205
return true
225206
}
226207
return false
@@ -326,18 +307,59 @@ func (r OperationSchemaValidationUpdateParamsMitigationAction) IsKnown() bool {
326307

327308
type OperationSchemaValidationEditParams struct {
328309
// Identifier.
329-
ZoneID param.Field[string] `path:"zone_id,required"`
330-
SettingsMultipleRequest SettingsMultipleRequestParam `json:"settings_multiple_request,required"`
310+
ZoneID param.Field[string] `path:"zone_id,required"`
311+
Body map[string]OperationSchemaValidationEditParamsBody `json:"body,required"`
331312
}
332313

333314
func (r OperationSchemaValidationEditParams) MarshalJSON() (data []byte, err error) {
334-
return apijson.MarshalRoot(r.SettingsMultipleRequest)
315+
return apijson.MarshalRoot(r.Body)
316+
}
317+
318+
// Operation ID to mitigation action mappings
319+
type OperationSchemaValidationEditParamsBody struct {
320+
// When set, this applies a mitigation action to this operation
321+
//
322+
// - `log` log request when request does not conform to schema for this operation
323+
// - `block` deny access to the site when request does not conform to schema for
324+
// this operation
325+
// - `none` will skip mitigation for this operation
326+
// - `null` indicates that no operation level mitigation is in place, see Zone
327+
// Level Schema Validation Settings for mitigation action that will be applied
328+
MitigationAction param.Field[OperationSchemaValidationEditParamsBodyMitigationAction] `json:"mitigation_action"`
329+
}
330+
331+
func (r OperationSchemaValidationEditParamsBody) MarshalJSON() (data []byte, err error) {
332+
return apijson.MarshalRoot(r)
333+
}
334+
335+
// When set, this applies a mitigation action to this operation
336+
//
337+
// - `log` log request when request does not conform to schema for this operation
338+
// - `block` deny access to the site when request does not conform to schema for
339+
// this operation
340+
// - `none` will skip mitigation for this operation
341+
// - `null` indicates that no operation level mitigation is in place, see Zone
342+
// Level Schema Validation Settings for mitigation action that will be applied
343+
type OperationSchemaValidationEditParamsBodyMitigationAction string
344+
345+
const (
346+
OperationSchemaValidationEditParamsBodyMitigationActionLog OperationSchemaValidationEditParamsBodyMitigationAction = "log"
347+
OperationSchemaValidationEditParamsBodyMitigationActionBlock OperationSchemaValidationEditParamsBodyMitigationAction = "block"
348+
OperationSchemaValidationEditParamsBodyMitigationActionNone OperationSchemaValidationEditParamsBodyMitigationAction = "none"
349+
)
350+
351+
func (r OperationSchemaValidationEditParamsBodyMitigationAction) IsKnown() bool {
352+
switch r {
353+
case OperationSchemaValidationEditParamsBodyMitigationActionLog, OperationSchemaValidationEditParamsBodyMitigationActionBlock, OperationSchemaValidationEditParamsBodyMitigationActionNone:
354+
return true
355+
}
356+
return false
335357
}
336358

337359
type OperationSchemaValidationEditResponseEnvelope struct {
338-
Errors Message `json:"errors,required"`
339-
Messages Message `json:"messages,required"`
340-
Result SettingsMultipleRequest `json:"result,required"`
360+
Errors Message `json:"errors,required"`
361+
Messages Message `json:"messages,required"`
362+
Result OperationSchemaValidationEditResponse `json:"result,required"`
341363
// Whether the API call was successful.
342364
Success OperationSchemaValidationEditResponseEnvelopeSuccess `json:"success,required"`
343365
JSON operationSchemaValidationEditResponseEnvelopeJSON `json:"-"`

‎api_gateway/operationschemavalidation_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ func TestOperationSchemaValidationEdit(t *testing.T) {
5959
)
6060
_, err := client.APIGateway.Operations.SchemaValidation.Edit(context.TODO(), api_gateway.OperationSchemaValidationEditParams{
6161
ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"),
62-
SettingsMultipleRequest: api_gateway.SettingsMultipleRequestParam{
63-
"3818d821-5901-4147-a474-f5f5aec1d54e": api_gateway.SettingsMultipleRequestItemParam{
64-
MitigationAction: cloudflare.F(api_gateway.SettingsMultipleRequestItemMitigationActionLog),
62+
Body: map[string]api_gateway.OperationSchemaValidationEditParamsBody{
63+
"3818d821-5901-4147-a474-f5f5aec1d54e": {
64+
MitigationAction: cloudflare.F(api_gateway.OperationSchemaValidationEditParamsBodyMitigationActionLog),
6565
},
66-
"b17c8043-99a0-4202-b7d9-8f7cdbee02cd": api_gateway.SettingsMultipleRequestItemParam{
67-
MitigationAction: cloudflare.F(api_gateway.SettingsMultipleRequestItemMitigationActionBlock),
66+
"b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {
67+
MitigationAction: cloudflare.F(api_gateway.OperationSchemaValidationEditParamsBodyMitigationActionBlock),
6868
},
6969
},
7070
})

‎api_gateway/setting.go‎

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
package api_gateway
44

55
import (
6-
"github.com/cloudflare/cloudflare-go/v6/internal/apijson"
76
"github.com/cloudflare/cloudflare-go/v6/option"
87
)
98

@@ -27,83 +26,3 @@ func NewSettingService(opts ...option.RequestOption) (r *SettingService) {
2726
r.SchemaValidation = NewSettingSchemaValidationService(opts...)
2827
return
2928
}
30-
31-
type Settings struct {
32-
// The default mitigation action used when there is no mitigation action defined on
33-
// the operation
34-
//
35-
// Mitigation actions are as follows:
36-
//
37-
// - `log` - log request when request does not conform to schema
38-
// - `block` - deny access to the site when request does not conform to schema
39-
//
40-
// A special value of of `none` will skip running schema validation entirely for
41-
// the request when there is no mitigation action defined on the operation
42-
ValidationDefaultMitigationAction SettingsValidationDefaultMitigationAction `json:"validation_default_mitigation_action"`
43-
// When set, this overrides both zone level and operation level mitigation actions.
44-
//
45-
// - `none` will skip running schema validation entirely for the request
46-
// - `null` indicates that no override is in place
47-
ValidationOverrideMitigationAction SettingsValidationOverrideMitigationAction `json:"validation_override_mitigation_action,nullable"`
48-
JSON settingsJSON `json:"-"`
49-
}
50-
51-
// settingsJSON contains the JSON metadata for the struct [Settings]
52-
type settingsJSON struct {
53-
ValidationDefaultMitigationAction apijson.Field
54-
ValidationOverrideMitigationAction apijson.Field
55-
raw string
56-
ExtraFields map[string]apijson.Field
57-
}
58-
59-
func (r *Settings) UnmarshalJSON(data []byte) (err error) {
60-
return apijson.UnmarshalRoot(data, r)
61-
}
62-
63-
func (r settingsJSON) RawJSON() string {
64-
return r.raw
65-
}
66-
67-
// The default mitigation action used when there is no mitigation action defined on
68-
// the operation
69-
//
70-
// Mitigation actions are as follows:
71-
//
72-
// - `log` - log request when request does not conform to schema
73-
// - `block` - deny access to the site when request does not conform to schema
74-
//
75-
// A special value of of `none` will skip running schema validation entirely for
76-
// the request when there is no mitigation action defined on the operation
77-
type SettingsValidationDefaultMitigationAction string
78-
79-
const (
80-
SettingsValidationDefaultMitigationActionNone SettingsValidationDefaultMitigationAction = "none"
81-
SettingsValidationDefaultMitigationActionLog SettingsValidationDefaultMitigationAction = "log"
82-
SettingsValidationDefaultMitigationActionBlock SettingsValidationDefaultMitigationAction = "block"
83-
)
84-
85-
func (r SettingsValidationDefaultMitigationAction) IsKnown() bool {
86-
switch r {
87-
case SettingsValidationDefaultMitigationActionNone, SettingsValidationDefaultMitigationActionLog, SettingsValidationDefaultMitigationActionBlock:
88-
return true
89-
}
90-
return false
91-
}
92-
93-
// When set, this overrides both zone level and operation level mitigation actions.
94-
//
95-
// - `none` will skip running schema validation entirely for the request
96-
// - `null` indicates that no override is in place
97-
type SettingsValidationOverrideMitigationAction string
98-
99-
const (
100-
SettingsValidationOverrideMitigationActionNone SettingsValidationOverrideMitigationAction = "none"
101-
)
102-
103-
func (r SettingsValidationOverrideMitigationAction) IsKnown() bool {
104-
switch r {
105-
case SettingsValidationOverrideMitigationActionNone:
106-
return true
107-
}
108-
return false
109-
}

0 commit comments

Comments
 (0)