Skip to content

Commit 06fd6e3

Browse files
albertchangalbertchang
authored
[fix] Change client validation of permissions revoke type (#42)
* [fix] Change client validation of permissions revoke type * test action update
1 parent 6de10ac commit 06fd6e3

11 files changed

+692
-98
lines changed

‎.github/workflows/main.yaml

+8-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Unit Tests
1212
runs-on: ubuntu-latest
1313
steps:
14-
- name: Check out the code
14+
- name: Check out the code
1515
uses: actions/checkout@v4
1616
- name: Set up Go
1717
uses: actions/setup-go@v5
@@ -25,7 +25,7 @@ jobs:
2525
name: Acceptance Tests
2626
runs-on: ubuntu-latest
2727
steps:
28-
- name: Check out the code
28+
- name: Check out the code
2929
uses: actions/checkout@v4
3030
- name: Set up Go
3131
uses: actions/setup-go@v5
@@ -39,7 +39,7 @@ jobs:
3939
name: Checks
4040
runs-on: ubuntu-latest
4141
steps:
42-
- name: Check out the code
42+
- name: Check out the code
4343
uses: actions/checkout@v4
4444

4545
- name: Set up Go
@@ -48,6 +48,11 @@ jobs:
4848
go-version-file: go.mod
4949
check-latest: true
5050

51+
- name: Setup Terraform with specified version on the runner
52+
uses: hashicorp/setup-terraform@v2
53+
with:
54+
terraform_wrapper: false
55+
5156
- name: Check the docs are up to date
5257
run: make check-docs
5358

‎internal/sdk/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ See https://github.com/OpenAPITools/openapi-generator/issues/741 for more detail
2828

2929
NOTE: To make the client work with our API, I had to manually update `openAPISpec.json` in quite a few places. So, I'd recommend manually copying the fragment of the spec that you need into the file instead of trying to replace the file completely.
3030

31+
One of these is for the imprecise conversion of zod discriminated unions (used internally) to openapi - instead of `oneOf` schemas, `anyOf` is more accurate for nested object types.
32+
3133
## Generate client library code
3234
Just run `go generate` in this folder. All generated code lives in the `api` folder.
3335
Command line parameters for `openapi-generator` invocation are controlled via `generate.go` file.

‎internal/sdk/api/.openapi-generator/FILES

+4-4
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ docs/PermissionsListObjectsPostRequestSubjectOneOf.md
140140
docs/PermissionsListObjectsPostRequestSubjectOneOf1.md
141141
docs/PermissionsRevokePost200Response.md
142142
docs/PermissionsRevokePost200ResponseDataInner.md
143-
docs/PermissionsRevokePost200ResponseDataInnerOneOf.md
144-
docs/PermissionsRevokePost200ResponseDataInnerOneOf1.md
143+
docs/PermissionsRevokePost200ResponseDataInnerAnyOf.md
144+
docs/PermissionsRevokePost200ResponseDataInnerAnyOf1.md
145145
docs/PermissionsRevokePostRequest.md
146146
docs/PostgresOptions.md
147147
docs/PostgresOptionsDatabaseOptions.md
@@ -407,8 +407,8 @@ model__permissions_list_objects_post_request_subject_one_of.go
407407
model__permissions_list_objects_post_request_subject_one_of_1.go
408408
model__permissions_revoke_post_200_response.go
409409
model__permissions_revoke_post_200_response_data_inner.go
410-
model__permissions_revoke_post_200_response_data_inner_one_of.go
411-
model__permissions_revoke_post_200_response_data_inner_one_of_1.go
410+
model__permissions_revoke_post_200_response_data_inner_any_of.go
411+
model__permissions_revoke_post_200_response_data_inner_any_of_1.go
412412
model__permissions_revoke_post_request.go
413413
model__resource_configurations__configuration_id__get_200_response.go
414414
model__resource_configurations_get_200_response.go

‎internal/sdk/api/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ Class | Method | HTTP request | Description
282282
- [PermissionsListObjectsPostRequestSubjectOneOf1](docs/PermissionsListObjectsPostRequestSubjectOneOf1.md)
283283
- [PermissionsRevokePost200Response](docs/PermissionsRevokePost200Response.md)
284284
- [PermissionsRevokePost200ResponseDataInner](docs/PermissionsRevokePost200ResponseDataInner.md)
285-
- [PermissionsRevokePost200ResponseDataInnerOneOf](docs/PermissionsRevokePost200ResponseDataInnerOneOf.md)
286-
- [PermissionsRevokePost200ResponseDataInnerOneOf1](docs/PermissionsRevokePost200ResponseDataInnerOneOf1.md)
285+
- [PermissionsRevokePost200ResponseDataInnerAnyOf](docs/PermissionsRevokePost200ResponseDataInnerAnyOf.md)
286+
- [PermissionsRevokePost200ResponseDataInnerAnyOf1](docs/PermissionsRevokePost200ResponseDataInnerAnyOf1.md)
287287
- [PermissionsRevokePostRequest](docs/PermissionsRevokePostRequest.md)
288288
- [PostgresOptions](docs/PostgresOptions.md)
289289
- [PostgresOptionsDatabaseOptions](docs/PostgresOptionsDatabaseOptions.md)

‎internal/sdk/api/api/openapi.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7613,7 +7613,7 @@ components:
76137613
- object
76147614
- subject
76157615
type: object
7616-
_permissions_revoke_post_200_response_data_inner_oneOf:
7616+
_permissions_revoke_post_200_response_data_inner_anyOf:
76177617
example:
76187618
access_level: own
76197619
id: id
@@ -7639,7 +7639,7 @@ components:
76397639
- id
76407640
- type
76417641
type: object
7642-
_permissions_revoke_post_200_response_data_inner_oneOf_1:
7642+
_permissions_revoke_post_200_response_data_inner_anyOf_1:
76437643
properties:
76447644
type:
76457645
enum:
@@ -7662,9 +7662,9 @@ components:
76627662
- type
76637663
type: object
76647664
_permissions_revoke_post_200_response_data_inner:
7665-
oneOf:
7666-
- $ref: '#/components/schemas/_permissions_revoke_post_200_response_data_inner_oneOf'
7667-
- $ref: '#/components/schemas/_permissions_revoke_post_200_response_data_inner_oneOf_1'
7665+
anyOf:
7666+
- $ref: '#/components/schemas/_permissions_revoke_post_200_response_data_inner_anyOf'
7667+
- $ref: '#/components/schemas/_permissions_revoke_post_200_response_data_inner_anyOf_1'
76687668
- $ref: '#/components/schemas/_permissions_listObjects_post_200_response_data_inner_oneOf'
76697669
_permissions_revoke_post_200_response:
76707670
example:

‎internal/sdk/api/docs/PermissionsRevokePost200ResponseDataInnerAnyOf.md

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# PermissionsRevokePost200ResponseDataInnerAnyOf
2+
3+
## Properties
4+
5+
Name | Type | Description | Notes
6+
------------ | ------------- | ------------- | -------------
7+
**Type** | **string** | |
8+
**Id** | **string** | The id of the folder |
9+
**AccessLevel** | **string** | The access level of the folder |
10+
11+
## Methods
12+
13+
### NewPermissionsRevokePost200ResponseDataInnerAnyOf
14+
15+
`func NewPermissionsRevokePost200ResponseDataInnerAnyOf(type_ string, id string, accessLevel string, ) *PermissionsRevokePost200ResponseDataInnerAnyOf`
16+
17+
NewPermissionsRevokePost200ResponseDataInnerAnyOf instantiates a new PermissionsRevokePost200ResponseDataInnerAnyOf object
18+
This constructor will assign default values to properties that have it defined,
19+
and makes sure properties required by API are set, but the set of arguments
20+
will change when the set of required properties is changed
21+
22+
### NewPermissionsRevokePost200ResponseDataInnerAnyOfWithDefaults
23+
24+
`func NewPermissionsRevokePost200ResponseDataInnerAnyOfWithDefaults() *PermissionsRevokePost200ResponseDataInnerAnyOf`
25+
26+
NewPermissionsRevokePost200ResponseDataInnerAnyOfWithDefaults instantiates a new PermissionsRevokePost200ResponseDataInnerAnyOf object
27+
This constructor will only assign default values to properties that have it defined,
28+
but it doesn't guarantee that properties required by API are set
29+
30+
### GetType
31+
32+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf) GetType() string`
33+
34+
GetType returns the Type field if non-nil, zero value otherwise.
35+
36+
### GetTypeOk
37+
38+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf) GetTypeOk() (*string, bool)`
39+
40+
GetTypeOk returns a tuple with the Type field if it's non-nil, zero value otherwise
41+
and a boolean to check if the value has been set.
42+
43+
### SetType
44+
45+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf) SetType(v string)`
46+
47+
SetType sets Type field to given value.
48+
49+
50+
### GetId
51+
52+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf) GetId() string`
53+
54+
GetId returns the Id field if non-nil, zero value otherwise.
55+
56+
### GetIdOk
57+
58+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf) GetIdOk() (*string, bool)`
59+
60+
GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
61+
and a boolean to check if the value has been set.
62+
63+
### SetId
64+
65+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf) SetId(v string)`
66+
67+
SetId sets Id field to given value.
68+
69+
70+
### GetAccessLevel
71+
72+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf) GetAccessLevel() string`
73+
74+
GetAccessLevel returns the AccessLevel field if non-nil, zero value otherwise.
75+
76+
### GetAccessLevelOk
77+
78+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf) GetAccessLevelOk() (*string, bool)`
79+
80+
GetAccessLevelOk returns a tuple with the AccessLevel field if it's non-nil, zero value otherwise
81+
and a boolean to check if the value has been set.
82+
83+
### SetAccessLevel
84+
85+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf) SetAccessLevel(v string)`
86+
87+
SetAccessLevel sets AccessLevel field to given value.
88+
89+
90+
91+
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
92+
93+

‎internal/sdk/api/docs/PermissionsRevokePost200ResponseDataInnerAnyOf1.md

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# PermissionsRevokePost200ResponseDataInnerAnyOf1
2+
3+
## Properties
4+
5+
Name | Type | Description | Notes
6+
------------ | ------------- | ------------- | -------------
7+
**Type** | **string** | |
8+
**Id** | **string** | The app ID. |
9+
**AccessLevel** | **string** | The access level of the app |
10+
11+
## Methods
12+
13+
### NewPermissionsRevokePost200ResponseDataInnerAnyOf1
14+
15+
`func NewPermissionsRevokePost200ResponseDataInnerAnyOf1(type_ string, id string, accessLevel string, ) *PermissionsRevokePost200ResponseDataInnerAnyOf1`
16+
17+
NewPermissionsRevokePost200ResponseDataInnerAnyOf1 instantiates a new PermissionsRevokePost200ResponseDataInnerAnyOf1 object
18+
This constructor will assign default values to properties that have it defined,
19+
and makes sure properties required by API are set, but the set of arguments
20+
will change when the set of required properties is changed
21+
22+
### NewPermissionsRevokePost200ResponseDataInnerAnyOf1WithDefaults
23+
24+
`func NewPermissionsRevokePost200ResponseDataInnerAnyOf1WithDefaults() *PermissionsRevokePost200ResponseDataInnerAnyOf1`
25+
26+
NewPermissionsRevokePost200ResponseDataInnerAnyOf1WithDefaults instantiates a new PermissionsRevokePost200ResponseDataInnerAnyOf1 object
27+
This constructor will only assign default values to properties that have it defined,
28+
but it doesn't guarantee that properties required by API are set
29+
30+
### GetType
31+
32+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf1) GetType() string`
33+
34+
GetType returns the Type field if non-nil, zero value otherwise.
35+
36+
### GetTypeOk
37+
38+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf1) GetTypeOk() (*string, bool)`
39+
40+
GetTypeOk returns a tuple with the Type field if it's non-nil, zero value otherwise
41+
and a boolean to check if the value has been set.
42+
43+
### SetType
44+
45+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf1) SetType(v string)`
46+
47+
SetType sets Type field to given value.
48+
49+
50+
### GetId
51+
52+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf1) GetId() string`
53+
54+
GetId returns the Id field if non-nil, zero value otherwise.
55+
56+
### GetIdOk
57+
58+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf1) GetIdOk() (*string, bool)`
59+
60+
GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
61+
and a boolean to check if the value has been set.
62+
63+
### SetId
64+
65+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf1) SetId(v string)`
66+
67+
SetId sets Id field to given value.
68+
69+
70+
### GetAccessLevel
71+
72+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf1) GetAccessLevel() string`
73+
74+
GetAccessLevel returns the AccessLevel field if non-nil, zero value otherwise.
75+
76+
### GetAccessLevelOk
77+
78+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf1) GetAccessLevelOk() (*string, bool)`
79+
80+
GetAccessLevelOk returns a tuple with the AccessLevel field if it's non-nil, zero value otherwise
81+
and a boolean to check if the value has been set.
82+
83+
### SetAccessLevel
84+
85+
`func (o *PermissionsRevokePost200ResponseDataInnerAnyOf1) SetAccessLevel(v string)`
86+
87+
SetAccessLevel sets AccessLevel field to given value.
88+
89+
90+
91+
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
92+
93+

0 commit comments

Comments
 (0)