Skip to content

Commit 959ccf3

Browse files
committed
Merge branch 'v2' of https://github.com/flyteorg/flyte into v2-executor-2
2 parents 6539dcb + 548b2eb commit 959ccf3

File tree

21 files changed

+3251
-396
lines changed

21 files changed

+3251
-396
lines changed

buf.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ deps:
77
- name: buf.build/googleapis/googleapis
88
commit: 62f35d8aed1149c291d606d958a7ce32
99
digest: b5:d66bf04adc77a0870bdc9328aaf887c7188a36fb02b83a480dc45ef9dc031b4d39fc6e9dc6435120ccf4fe5bfd5c6cb6592533c6c316595571f9a31420ab47fe
10+
- name: buf.build/grpc-ecosystem/grpc-gateway
11+
commit: 6467306b4f624747aaf6266762ee7a1c
12+
digest: b5:c2caa61467d992749812c909f93c07e9a667da33c758a7c1973d63136c23b3cafcc079985b12cdf54a10049ed3297418f1eda42cdffdcf34113792dcc3a990af

buf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: buf.build/flyteorg/flyte
33
deps:
44
- buf.build/googleapis/googleapis:62f35d8aed1149c291d606d958a7ce32
55
- buf.build/bufbuild/protovalidate:v0.14.1
6+
- buf.build/grpc-ecosystem/grpc-gateway
67
lint:
78
except:
89
- PACKAGE_VERSION_SUFFIX

flyteidl2/dataproxy/dataproxy_service.proto

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,27 @@ syntax = "proto3";
33
package flyteidl2.dataproxy;
44

55
import "buf/validate/validate.proto";
6+
import "google/api/annotations.proto";
67
import "google/protobuf/duration.proto";
78
import "google/protobuf/timestamp.proto";
9+
import "protoc-gen-openapiv2/options/annotations.proto";
810

911
option go_package = "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/dataproxy";
1012

1113
// DataProxyService provides an interface for managing data uploads and downloads.
1214
service DataProxyService {
1315
// CreateUploadLocation generates a signed URL for uploading data to the configured storage backend.
14-
rpc CreateUploadLocation(CreateUploadLocationRequest) returns (CreateUploadLocationResponse) {}
16+
rpc CreateUploadLocation(CreateUploadLocationRequest) returns (CreateUploadLocationResponse) {
17+
option (google.api.http) = {
18+
post: "/api/v1/dataproxy/artifact_urn"
19+
body: "*"
20+
additional_bindings: {
21+
post: "/api/v1/org/dataproxy/artifact_urn"
22+
body: "*"
23+
}
24+
};
25+
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {description: "Creates a write-only http location that is accessible for tasks at runtime."};
26+
}
1527
}
1628

1729
// CreateUploadLocationRequest specifies the request for the CreateUploadLocation API.

gen/go/flyteidl2/dataproxy/dataproxy_service.pb.go

Lines changed: 87 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/gateway/flyteidl2/connector/service.swagger.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,7 +1433,7 @@
14331433
"$ref": "#/definitions/coreBinary"
14341434
},
14351435
"schema": {
1436-
"$ref": "#/definitions/coreSchema"
1436+
"$ref": "#/definitions/flyteidl2coreSchema"
14371437
},
14381438
"none_type": {
14391439
"$ref": "#/definitions/coreVoid"
@@ -1452,18 +1452,6 @@
14521452
}
14531453
}
14541454
},
1455-
"coreSchema": {
1456-
"type": "object",
1457-
"properties": {
1458-
"uri": {
1459-
"type": "string"
1460-
},
1461-
"type": {
1462-
"$ref": "#/definitions/coreSchemaType"
1463-
}
1464-
},
1465-
"description": "A strongly typed schema that defines the interface of data retrieved from the underlying storage medium."
1466-
},
14671455
"coreSchemaType": {
14681456
"type": "object",
14691457
"properties": {
@@ -2016,6 +2004,18 @@
20162004
],
20172005
"default": "OTHER"
20182006
},
2007+
"flyteidl2coreSchema": {
2008+
"type": "object",
2009+
"properties": {
2010+
"uri": {
2011+
"type": "string"
2012+
},
2013+
"type": {
2014+
"$ref": "#/definitions/coreSchemaType"
2015+
}
2016+
},
2017+
"description": "A strongly typed schema that defines the interface of data retrieved from the underlying storage medium."
2018+
},
20192019
"flyteidl2coreSecret": {
20202020
"type": "object",
20212021
"properties": {

0 commit comments

Comments
 (0)