Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions buf.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
version: v2
deps:
- name: buf.build/aep/api
commit: 1454930c8f994a1980143dae475be0a2
digest: b5:7c0b638065cd7705d85bdddc0c3cd22bf7b438e27e14109f811a3bd5c01d92318901b5aa63173de6e31f1cff75f912c953e72cc03487b717e72bbe1de264ee25
commit: 26a011a354ee4836847fff32738f12a2
digest: b5:5f32f8d8d0eaafd808d9162b0a1c1d2d3e6ed3710d20973a036788727c2a54ce2771f198a053132aa892f5986690995093c0b7538b879fc1c0c9dee4d05ac156
- name: buf.build/bufbuild/protovalidate
commit: f05a6f4403ce4327bae4f50f281c3ed0
digest: b5:f1d76430ee97c89cd2044e9ae1c510887b701ee7bca60564ebf82e3919e53cacefc830a0eb803277c2d98c5f313b4167e8914afc9f214332717a50b5e170e6f4
commit: 52f32327d4b045a79293a6ad4e7e1236
digest: b5:cbabc98d4b7b7b0447c9b15f68eeb8a7a44ef8516cb386ac5f66e7fd4062cd6723ed3f452ad8c384b851f79e33d26e7f8a94e2b807282b3def1cd966c7eace97
- name: buf.build/googleapis/googleapis
commit: 28151c0d0a1641bf938a7672c500e01d
digest: b5:93b70089baa4fc05a92d3e52db91a4b7812db3b57b9664f6cb301733938cb630e377a938e8a56779388171c749c1d42a2e9a6c6230f2ff45f127a8102a6a27d0
1,277 changes: 637 additions & 640 deletions example/bookstore/v1/bookstore.pb.go

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions example/bookstore/v1/bookstore.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ package example.bookstore.v1;

import "aep/api/field_info.proto";
import "aep/api/operation.proto";
import "aep/api/resource.proto";
import "google/api/annotations.proto";
import "google/api/client.proto";
import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto";

Expand Down Expand Up @@ -274,11 +274,11 @@ service Bookstore {

// A Book.
message Book {
option (google.api.resource) = {
option (aep.api.resource) = {
type: "bookstore.example.com/book"
pattern: ["publishers/{publisher_id}/books/{book_id}"]
plural: "books"
singular: "book"
plural: "books"
};

// A Author.
Expand Down Expand Up @@ -331,11 +331,11 @@ message Book {

// A BookEdition.
message BookEdition {
option (google.api.resource) = {
option (aep.api.resource) = {
type: "bookstore.example.com/book-edition"
pattern: ["publishers/{publisher_id}/books/{book_id}/editions/{book_edition_id}"]
plural: "book-editions"
singular: "book-edition"
plural: "book-editions"
};

// Field for display_name.
Expand All @@ -353,11 +353,11 @@ message BookEdition {

// A Isbn.
message Isbn {
option (google.api.resource) = {
option (aep.api.resource) = {
type: "bookstore.example.com/isbn"
pattern: ["isbns/{isbn_id}"]
plural: "isbns"
singular: "isbn"
plural: "isbns"
};

// Field for path.
Expand All @@ -366,11 +366,11 @@ message Isbn {

// A Item.
message Item {
option (google.api.resource) = {
option (aep.api.resource) = {
type: "bookstore.example.com/item"
pattern: ["stores/{store_id}/items/{item_id}"]
plural: "items"
singular: "item"
plural: "items"
};

// Field for book.
Expand Down Expand Up @@ -398,11 +398,11 @@ message Item {

// A Publisher.
message Publisher {
option (google.api.resource) = {
option (aep.api.resource) = {
type: "bookstore.example.com/publisher"
pattern: ["publishers/{publisher_id}"]
plural: "publishers"
singular: "publisher"
plural: "publishers"
};

// Field for description.
Expand All @@ -414,11 +414,11 @@ message Publisher {

// A Store.
message Store {
option (google.api.resource) = {
option (aep.api.resource) = {
type: "bookstore.example.com/store"
pattern: ["stores/{store_id}"]
plural: "stores"
singular: "store"
plural: "stores"
};

// Field for name.
Expand Down
45 changes: 30 additions & 15 deletions example/bookstore/v1/bookstore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ resources:
properties:
description:
type: string
x-aep-field-number: 1
x-aep-field:
field_number: 1
methods:
create:
supports_user_settable_create: true
Expand All @@ -36,30 +37,37 @@ resources:
type: array
items:
type: string
x-aep-field-number: 1
x-aep-field:
field_number: 1
price:
type: integer
format: int32
x-aep-field-number: 2
x-aep-field:
field_number: 2
published:
type: boolean
x-aep-field-number: 3
x-aep-field:
field_number: 3
edition:
type: integer
format: int32
x-aep-field-number: 4
x-aep-field:
field_number: 4
author:
type: array
x-aep-field-number: 5
x-aep-field:
field_number: 5
items:
type: object
properties:
given_name:
type: string
x-aep-field-number: 1
x-aep-field:
field_number: 1
family_name:
type: string
x-aep-field-number: 2
x-aep-field:
field_number: 2
methods:
create:
supports_user_settable_create: true
Expand Down Expand Up @@ -91,7 +99,8 @@ resources:
properties:
display_name:
type: string
x-aep-field-number: 1
x-aep-field:
field_number: 1
methods:
create:
supports_user_settable_create: true
Expand All @@ -117,10 +126,12 @@ resources:
properties:
name:
type: string
x-aep-field-number: 1
x-aep-field:
field_number: 1
description:
type: string
x-aep-field-number: 2
x-aep-field:
field_number: 2
methods:
create:
supports_user_settable_create: true
Expand All @@ -140,14 +151,17 @@ resources:
properties:
book:
type: string
x-aep-field-number: 1
x-aep-field:
field_number: 1
condition:
type: string
x-aep-field-number: 2
x-aep-field:
field_number: 2
price:
type: number
format: double
x-aep-field-number: 3
x-aep-field:
field_number: 3
methods:
create:
supports_user_settable_create: true
Expand All @@ -167,4 +181,5 @@ resources:
properties:
target_store:
type: string
x-aep-field-number: 1
x-aep-field:
field_number: 1
26 changes: 18 additions & 8 deletions example/bookstore/v1/bookstore_openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1349,11 +1349,15 @@
"properties": {
"family_name": {
"type": "string",
"x-aep-field-number": 2
"x-aep-field": {
"field_number": 2
}
},
"given_name": {
"type": "string",
"x-aep-field-number": 1
"x-aep-field": {
"field_number": 1
}
}
}
}
Expand Down Expand Up @@ -1388,7 +1392,8 @@
],
"parents": [
"publisher"
]
],
"type": "bookstore.example.com/book"
},
"required": [
"edition",
Expand Down Expand Up @@ -1416,7 +1421,8 @@
],
"parents": [
"book"
]
],
"type": "bookstore.example.com/book-edition"
},
"required": [
"display_name"
Expand All @@ -1435,7 +1441,8 @@
"plural": "isbns",
"patterns": [
"isbns/{isbn_id}"
]
],
"type": "bookstore.example.com/isbn"
}
},
"item": {
Expand Down Expand Up @@ -1464,7 +1471,8 @@
],
"parents": [
"store"
]
],
"type": "bookstore.example.com/item"
},
"required": [
"title",
Expand All @@ -1488,7 +1496,8 @@
"plural": "publishers",
"patterns": [
"publishers/{publisher_id}"
]
],
"type": "bookstore.example.com/publisher"
}
},
"store": {
Expand All @@ -1510,7 +1519,8 @@
"plural": "stores",
"patterns": [
"stores/{store_id}"
]
],
"type": "bookstore.example.com/store"
},
"required": [
"name"
Expand Down
12 changes: 10 additions & 2 deletions example/bookstore/v1/bookstore_openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ components:
properties:
family_name:
type: string
x-aep-field-number: 2
x-aep-field:
field_number: 2
given_name:
type: string
x-aep-field-number: 1
x-aep-field:
field_number: 1
type: object
type: array
edition:
Expand Down Expand Up @@ -42,6 +44,7 @@ components:
- publishers/{publisher_id}/books/{book_id}
plural: books
singular: book
type: bookstore.example.com/book
book-edition:
properties:
display_name:
Expand All @@ -60,6 +63,7 @@ components:
- publishers/{publisher_id}/books/{book_id}/editions/{book_edition_id}
plural: book-editions
singular: book-edition
type: bookstore.example.com/book-edition
isbn:
properties:
path:
Expand All @@ -72,6 +76,7 @@ components:
- isbns/{isbn_id}
plural: isbns
singular: isbn
type: bookstore.example.com/isbn
item:
properties:
book:
Expand All @@ -97,6 +102,7 @@ components:
- stores/{store_id}/items/{item_id}
plural: items
singular: item
type: bookstore.example.com/item
publisher:
properties:
description:
Expand All @@ -111,6 +117,7 @@ components:
- publishers/{publisher_id}
plural: publishers
singular: publisher
type: bookstore.example.com/publisher
store:
properties:
description:
Expand All @@ -129,6 +136,7 @@ components:
- stores/{store_id}
plural: stores
singular: store
type: bookstore.example.com/store
info:
contact:
email: aepsupport@aep.dev
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ go 1.23.0
toolchain go1.23.6

require (
buf.build/gen/go/aep/api/protocolbuffers/go v1.36.10-20251011185002-1454930c8f99.1
buf.build/gen/go/aep/api/protocolbuffers/go v1.36.10-20251109183837-26a011a354ee.1
cloud.google.com/go/longrunning v0.6.6
github.com/aep-dev/aep-lib-go v0.0.0-20251011190527-4b8a96d91310
github.com/aep-dev/aep-lib-go v0.0.0-20251111165230-98620886fcd9
github.com/aep-dev/terraform-provider-aep v0.0.0-20241112052633-f48d45460768
github.com/google/cel-go v0.22.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
Expand All @@ -21,7 +21,7 @@ require (
)

require (
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.10-20240221180331-f05a6f4403ce.1 // indirect
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.10-20250912141014-52f32327d4b0.1 // indirect
cel.dev/expr v0.19.1 // indirect
github.com/DataDog/datadog-go v2.2.0+incompatible // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
Expand Down
Loading