Skip to content

Commit ce934db

Browse files
fitzergeraldfitzergerald
committed
fix: type design parity ids
1 parent 9595bea commit ce934db

3 files changed

Lines changed: 53 additions & 25 deletions

File tree

‎schemas/constructs/v1beta1/design/api.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ paths:
3434
required: false
3535
description: UUID of User. Pass user_id for fetching public and published designs.
3636
schema:
37-
type: string
37+
$ref: "../../v1alpha1/core/api.yml#/components/schemas/uuid"
3838
- name: orgID
3939
in: query
4040
required: false
4141
description: User's organization ID.
4242
schema:
43-
type: string
43+
$ref: "../../v1alpha1/core/api.yml#/components/schemas/organization_id"
4444
- name: metrics
4545
in: query
4646
required: false
@@ -50,7 +50,7 @@ paths:
5050
in: query
5151
required: false
5252
schema:
53-
type: string
53+
$ref: "../../v1alpha1/core/api.yml#/components/schemas/workspace_id"
5454
- name: populate
5555
in: query
5656
required: false

‎typescript/generated/v1beta1/pattern/PatternSchema.ts‎

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,13 @@ const PatternSchema: Record<string, unknown> = {
7878
"required": false,
7979
"description": "UUID of User. Pass user_id for fetching public and published designs.",
8080
"schema": {
81-
"type": "string"
81+
"type": "string",
82+
"format": "uuid",
83+
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
84+
"x-go-type": "uuid.UUID",
85+
"x-go-type-import": {
86+
"path": "github.com/gofrs/uuid"
87+
}
8288
}
8389
},
8490
{
@@ -87,7 +93,18 @@ const PatternSchema: Record<string, unknown> = {
8793
"required": false,
8894
"description": "User's organization ID.",
8995
"schema": {
90-
"type": "string"
96+
"type": "string",
97+
"format": "uuid",
98+
"x-go-type": "uuid.UUID",
99+
"x-go-type-import": {
100+
"path": "github.com/gofrs/uuid"
101+
},
102+
"x-oapi-codegen-extra-tags": {
103+
"db": "org_id",
104+
"json": "org_id"
105+
},
106+
"x-go-type-name": "OrganizationId",
107+
"x-go-type-skip-optional-pointer": true
91108
}
92109
},
93110
{
@@ -103,7 +120,18 @@ const PatternSchema: Record<string, unknown> = {
103120
"in": "query",
104121
"required": false,
105122
"schema": {
106-
"type": "string"
123+
"type": "string",
124+
"format": "uuid",
125+
"x-go-type": "uuid.UUID",
126+
"x-go-type-import": {
127+
"path": "github.com/gofrs/uuid"
128+
},
129+
"x-oapi-codegen-extra-tags": {
130+
"db": "workspace_id",
131+
"json": "workspace_id"
132+
},
133+
"x-go-type-name": "WorkspaceId",
134+
"x-go-type-skip-optional-pointer": true
107135
}
108136
},
109137
{
@@ -264,14 +292,14 @@ const PatternSchema: Record<string, unknown> = {
264292
"additionalProperties": false,
265293
"properties": {
266294
"id": {
267-
"x-order": 1,
268295
"type": "string",
269296
"format": "uuid",
270297
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
271298
"x-go-type": "uuid.UUID",
272299
"x-go-type-import": {
273300
"path": "github.com/gofrs/uuid"
274-
}
301+
},
302+
"x-order": 1
275303
},
276304
"name": {
277305
"type": "string",
@@ -5070,14 +5098,14 @@ const PatternSchema: Record<string, unknown> = {
50705098
"additionalProperties": false,
50715099
"properties": {
50725100
"id": {
5073-
"x-order": 1,
50745101
"type": "string",
50755102
"format": "uuid",
50765103
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
50775104
"x-go-type": "uuid.UUID",
50785105
"x-go-type-import": {
50795106
"path": "github.com/gofrs/uuid"
5080-
}
5107+
},
5108+
"x-order": 1
50815109
},
50825110
"name": {
50835111
"type": "string",
@@ -9843,14 +9871,14 @@ const PatternSchema: Record<string, unknown> = {
98439871
"additionalProperties": false,
98449872
"properties": {
98459873
"id": {
9846-
"x-order": 1,
98479874
"type": "string",
98489875
"format": "uuid",
98499876
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
98509877
"x-go-type": "uuid.UUID",
98519878
"x-go-type-import": {
98529879
"path": "github.com/gofrs/uuid"
9853-
}
9880+
},
9881+
"x-order": 1
98549882
},
98559883
"name": {
98569884
"type": "string",
@@ -14987,14 +15015,14 @@ const PatternSchema: Record<string, unknown> = {
1498715015
"additionalProperties": false,
1498815016
"properties": {
1498915017
"id": {
14990-
"x-order": 1,
1499115018
"type": "string",
1499215019
"format": "uuid",
1499315020
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
1499415021
"x-go-type": "uuid.UUID",
1499515022
"x-go-type-import": {
1499615023
"path": "github.com/gofrs/uuid"
14997-
}
15024+
},
15025+
"x-order": 1
1499815026
},
1499915027
"name": {
1500015028
"type": "string",
@@ -19868,14 +19896,14 @@ const PatternSchema: Record<string, unknown> = {
1986819896
"additionalProperties": false,
1986919897
"properties": {
1987019898
"id": {
19871-
"x-order": 1,
1987219899
"type": "string",
1987319900
"format": "uuid",
1987419901
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
1987519902
"x-go-type": "uuid.UUID",
1987619903
"x-go-type-import": {
1987719904
"path": "github.com/gofrs/uuid"
19878-
}
19905+
},
19906+
"x-order": 1
1987919907
},
1988019908
"name": {
1988119909
"type": "string",
@@ -24895,14 +24923,14 @@ const PatternSchema: Record<string, unknown> = {
2489524923
"additionalProperties": false,
2489624924
"properties": {
2489724925
"id": {
24898-
"x-order": 1,
2489924926
"type": "string",
2490024927
"format": "uuid",
2490124928
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
2490224929
"x-go-type": "uuid.UUID",
2490324930
"x-go-type-import": {
2490424931
"path": "github.com/gofrs/uuid"
24905-
}
24932+
},
24933+
"x-order": 1
2490624934
},
2490724935
"name": {
2490824936
"type": "string",
@@ -29625,14 +29653,14 @@ const PatternSchema: Record<string, unknown> = {
2962529653
"additionalProperties": false,
2962629654
"properties": {
2962729655
"id": {
29628-
"x-order": 1,
2962929656
"type": "string",
2963029657
"format": "uuid",
2963129658
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
2963229659
"x-go-type": "uuid.UUID",
2963329660
"x-go-type-import": {
2963429661
"path": "github.com/gofrs/uuid"
29635-
}
29662+
},
29663+
"x-order": 1
2963629664
},
2963729665
"name": {
2963829666
"type": "string",
@@ -34387,14 +34415,14 @@ const PatternSchema: Record<string, unknown> = {
3438734415
"additionalProperties": false,
3438834416
"properties": {
3438934417
"id": {
34390-
"x-order": 1,
3439134418
"type": "string",
3439234419
"format": "uuid",
3439334420
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
3439434421
"x-go-type": "uuid.UUID",
3439534422
"x-go-type-import": {
3439634423
"path": "github.com/gofrs/uuid"
34397-
}
34424+
},
34425+
"x-order": 1
3439834426
},
3439934427
"name": {
3440034428
"type": "string",
@@ -39181,14 +39209,14 @@ const PatternSchema: Record<string, unknown> = {
3918139209
"additionalProperties": false,
3918239210
"properties": {
3918339211
"id": {
39184-
"x-order": 1,
3918539212
"type": "string",
3918639213
"format": "uuid",
3918739214
"description": "A Universally Unique Identifier used to uniquely identify entities in Meshery. The UUID core definition is used across different schemas.",
3918839215
"x-go-type": "uuid.UUID",
3918939216
"x-go-type-import": {
3919039217
"path": "github.com/gofrs/uuid"
39191-
}
39218+
},
39219+
"x-order": 1
3919239220
},
3919339221
"name": {
3919439222
"type": "string",

‎typescript/rtk/cloud.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4119,7 +4119,7 @@ export type GetPatternsApiArg = {
41194119
order?: string;
41204120
/** Filter by visibility (public, private, published) */
41214121
visibility?: string;
4122-
/** UUID of User. Use `userId` to fetch public and published designs (mapped to the `user_id` query parameter). */
4122+
/** UUID of User. Use `userId` to fetch public and published designs; it maps to the `user_id` query parameter. */
41234123
userId?: string;
41244124
/** User's organization ID. */
41254125
orgId?: string;

0 commit comments

Comments
 (0)