diff --git a/flyteidl2/imagebuilder/definition.proto b/flyteidl2/imagebuilder/definition.proto index e643e80929..b4c4031638 100644 --- a/flyteidl2/imagebuilder/definition.proto +++ b/flyteidl2/imagebuilder/definition.proto @@ -10,6 +10,12 @@ option go_package = "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/imagebuilder" // ImageIdentifier is how to identify an image message ImageIdentifier { string name = 1 [(buf.validate.field).string.min_len = 1]; + + // Optional registry/repository the image lives in, e.g. + // ".dkr.ecr..amazonaws.com/" for an image built with a custom registry + // override (clone(registry=...)). When set, GetImage looks the image up there; when empty, the + // cluster's default repository is used. + string repository = 2; } // Simple container to surface if image exists diff --git a/gen/go/flyteidl2/imagebuilder/definition.pb.go b/gen/go/flyteidl2/imagebuilder/definition.pb.go index a94249ad76..d6d3341e3c 100644 --- a/gen/go/flyteidl2/imagebuilder/definition.pb.go +++ b/gen/go/flyteidl2/imagebuilder/definition.pb.go @@ -29,6 +29,11 @@ type ImageIdentifier struct { unknownFields protoimpl.UnknownFields Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // Optional registry/repository the image lives in, e.g. + // ".dkr.ecr..amazonaws.com/" for an image built with a custom registry + // override (clone(registry=...)). When set, GetImage looks the image up there; when empty, the + // cluster's default repository is used. + Repository string `protobuf:"bytes,2,opt,name=repository,proto3" json:"repository,omitempty"` } func (x *ImageIdentifier) Reset() { @@ -70,6 +75,13 @@ func (x *ImageIdentifier) GetName() string { return "" } +func (x *ImageIdentifier) GetRepository() string { + if x != nil { + return x.Repository + } + return "" +} + // Simple container to surface if image exists type Image struct { state protoimpl.MessageState @@ -1138,10 +1150,12 @@ var file_flyteidl2_imagebuilder_definition_proto_rawDesc = []byte{ 0x72, 0x1a, 0x1b, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x73, - 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2e, 0x0a, + 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4e, 0x0a, 0x0f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, - 0xba, 0x48, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x54, 0x0a, + 0xba, 0x48, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, + 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x54, 0x0a, 0x05, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x32, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x49, 0x6d, 0x61, 0x67, diff --git a/gen/go/flyteidl2/imagebuilder/definition.pb.validate.go b/gen/go/flyteidl2/imagebuilder/definition.pb.validate.go index 62eb139287..67e8bfc5df 100644 --- a/gen/go/flyteidl2/imagebuilder/definition.pb.validate.go +++ b/gen/go/flyteidl2/imagebuilder/definition.pb.validate.go @@ -59,6 +59,8 @@ func (m *ImageIdentifier) validate(all bool) error { // no validation rules for Name + // no validation rules for Repository + if len(errors) > 0 { return ImageIdentifierMultiError(errors) } diff --git a/gen/go/gateway/flyteidl2/imagebuilder/definition.swagger.json b/gen/go/gateway/flyteidl2/imagebuilder/definition.swagger.json index 04873e7816..8de2ee5b8b 100644 --- a/gen/go/gateway/flyteidl2/imagebuilder/definition.swagger.json +++ b/gen/go/gateway/flyteidl2/imagebuilder/definition.swagger.json @@ -12,39 +12,33 @@ ], "paths": {}, "definitions": { - "googlerpcStatus": { + "protobufAny": { + "type": "object", + "properties": { + "@type": { + "type": "string" + } + }, + "additionalProperties": {} + }, + "rpcStatus": { "type": "object", "properties": { "code": { "type": "integer", - "format": "int32", - "description": "The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]." + "format": "int32" }, "message": { - "type": "string", - "description": "A developer-facing error message, which should be in English. Any\nuser-facing error message should be localized and sent in the\n[google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client." + "type": "string" }, "details": { "type": "array", "items": { "type": "object", "$ref": "#/definitions/protobufAny" - }, - "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." + } } - }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." - }, - "protobufAny": { - "type": "object", - "properties": { - "@type": { - "type": "string", - "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com. As of May 2023, there are no widely used type server\nimplementations and no plans to implement one.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." - } - }, - "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + } } } } diff --git a/gen/go/gateway/flyteidl2/imagebuilder/payload.swagger.json b/gen/go/gateway/flyteidl2/imagebuilder/payload.swagger.json index b4e0de3b57..b8287c78a1 100644 --- a/gen/go/gateway/flyteidl2/imagebuilder/payload.swagger.json +++ b/gen/go/gateway/flyteidl2/imagebuilder/payload.swagger.json @@ -12,39 +12,33 @@ ], "paths": {}, "definitions": { - "googlerpcStatus": { + "protobufAny": { + "type": "object", + "properties": { + "@type": { + "type": "string" + } + }, + "additionalProperties": {} + }, + "rpcStatus": { "type": "object", "properties": { "code": { "type": "integer", - "format": "int32", - "description": "The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]." + "format": "int32" }, "message": { - "type": "string", - "description": "A developer-facing error message, which should be in English. Any\nuser-facing error message should be localized and sent in the\n[google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client." + "type": "string" }, "details": { "type": "array", "items": { "type": "object", "$ref": "#/definitions/protobufAny" - }, - "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." + } } - }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." - }, - "protobufAny": { - "type": "object", - "properties": { - "@type": { - "type": "string", - "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com. As of May 2023, there are no widely used type server\nimplementations and no plans to implement one.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." - } - }, - "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + } } } } diff --git a/gen/go/gateway/flyteidl2/imagebuilder/service.swagger.json b/gen/go/gateway/flyteidl2/imagebuilder/service.swagger.json index 29d1562307..be047b89c1 100644 --- a/gen/go/gateway/flyteidl2/imagebuilder/service.swagger.json +++ b/gen/go/gateway/flyteidl2/imagebuilder/service.swagger.json @@ -17,39 +17,33 @@ ], "paths": {}, "definitions": { - "googlerpcStatus": { + "protobufAny": { + "type": "object", + "properties": { + "@type": { + "type": "string" + } + }, + "additionalProperties": {} + }, + "rpcStatus": { "type": "object", "properties": { "code": { "type": "integer", - "format": "int32", - "description": "The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]." + "format": "int32" }, "message": { - "type": "string", - "description": "A developer-facing error message, which should be in English. Any\nuser-facing error message should be localized and sent in the\n[google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client." + "type": "string" }, "details": { "type": "array", "items": { "type": "object", "$ref": "#/definitions/protobufAny" - }, - "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." + } } - }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." - }, - "protobufAny": { - "type": "object", - "properties": { - "@type": { - "type": "string", - "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com. As of May 2023, there are no widely used type server\nimplementations and no plans to implement one.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." - } - }, - "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + } } } } diff --git a/gen/python/flyteidl2/imagebuilder/definition_pb2.py b/gen/python/flyteidl2/imagebuilder/definition_pb2.py index b068cec6f2..38b7402389 100644 --- a/gen/python/flyteidl2/imagebuilder/definition_pb2.py +++ b/gen/python/flyteidl2/imagebuilder/definition_pb2.py @@ -15,7 +15,7 @@ from flyteidl2.core import security_pb2 as flyteidl2_dot_core_dot_security__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'flyteidl2/imagebuilder/definition.proto\x12\x16\x66lyteidl2.imagebuilder\x1a\x1b\x62uf/validate/validate.proto\x1a\x1d\x66lyteidl2/core/security.proto\".\n\x0fImageIdentifier\x12\x1b\n\x04name\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04name\"T\n\x05Image\x12\x37\n\x02id\x18\x01 \x01(\x0b\x32\'.flyteidl2.imagebuilder.ImageIdentifierR\x02id\x12\x12\n\x04\x66qin\x18\x02 \x01(\tR\x04\x66qin\"f\n\x0b\x41ptPackages\x12\x1a\n\x08packages\x18\x01 \x03(\tR\x08packages\x12;\n\rsecret_mounts\x18\x02 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"\x84\x01\n\nPipOptions\x12\x1b\n\tindex_url\x18\x02 \x01(\tR\x08indexUrl\x12(\n\x10\x65xtra_index_urls\x18\x03 \x03(\tR\x0e\x65xtraIndexUrls\x12\x10\n\x03pre\x18\x04 \x01(\x08R\x03pre\x12\x1d\n\nextra_args\x18\x05 \x01(\tR\textraArgs\"\xa4\x01\n\x0bPipPackages\x12\x1a\n\x08packages\x18\x01 \x03(\tR\x08packages\x12<\n\x07options\x18\x02 \x01(\x0b\x32\".flyteidl2.imagebuilder.PipOptionsR\x07options\x12;\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"\x9d\x01\n\x0cRequirements\x12\x12\n\x04\x66ile\x18\x01 \x01(\tR\x04\x66ile\x12<\n\x07options\x18\x02 \x01(\x0b\x32\".flyteidl2.imagebuilder.PipOptionsR\x07options\x12;\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"\xbe\x01\n\x0cPythonWheels\x12\x10\n\x03\x64ir\x18\x01 \x01(\tR\x03\x64ir\x12<\n\x07options\x18\x02 \x01(\x0b\x32\".flyteidl2.imagebuilder.PipOptionsR\x07options\x12;\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\x12!\n\x0cpackage_name\x18\x04 \x01(\tR\x0bpackageName\"\xdb\x01\n\tUVProject\x12\x1c\n\tpyproject\x18\x01 \x01(\tR\tpyproject\x12\x16\n\x06uvlock\x18\x02 \x01(\tR\x06uvlock\x12<\n\x07options\x18\x03 \x01(\x0b\x32\".flyteidl2.imagebuilder.PipOptionsR\x07options\x12;\n\rsecret_mounts\x18\x04 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\x12\x1d\n\nsource_dir\x18\x05 \x01(\tR\tsourceDir\"Y\n\x08\x43ommands\x12\x10\n\x03\x63md\x18\x02 \x03(\tR\x03\x63md\x12;\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"#\n\x07WorkDir\x12\x18\n\x07workdir\x18\x01 \x01(\tR\x07workdir\"0\n\nCopyConfig\x12\x10\n\x03src\x18\x01 \x01(\tR\x03src\x12\x10\n\x03\x64st\x18\x02 \x01(\tR\x03\x64st\"\x9a\x01\n\x03\x45nv\x12R\n\renv_variables\x18\x01 \x03(\x0b\x32-.flyteidl2.imagebuilder.Env.EnvVariablesEntryR\x0c\x65nvVariables\x1a?\n\x11\x45nvVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xaa\x01\n\rPoetryProject\x12\x1c\n\tpyproject\x18\x01 \x01(\tR\tpyproject\x12\x1f\n\x0bpoetry_lock\x18\x02 \x01(\tR\npoetryLock\x12\x1d\n\nextra_args\x18\x03 \x01(\tR\textraArgs\x12;\n\rsecret_mounts\x18\x04 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"\xc6\x05\n\x05Layer\x12H\n\x0c\x61pt_packages\x18\x01 \x01(\x0b\x32#.flyteidl2.imagebuilder.AptPackagesH\x00R\x0b\x61ptPackages\x12H\n\x0cpip_packages\x18\x02 \x01(\x0b\x32#.flyteidl2.imagebuilder.PipPackagesH\x00R\x0bpipPackages\x12>\n\x08\x63ommands\x18\x03 \x01(\x0b\x32 .flyteidl2.imagebuilder.CommandsH\x00R\x08\x63ommands\x12J\n\x0crequirements\x18\x04 \x01(\x0b\x32$.flyteidl2.imagebuilder.RequirementsH\x00R\x0crequirements\x12K\n\rpython_wheels\x18\x05 \x01(\x0b\x32$.flyteidl2.imagebuilder.PythonWheelsH\x00R\x0cpythonWheels\x12;\n\x07workdir\x18\x06 \x01(\x0b\x32\x1f.flyteidl2.imagebuilder.WorkDirH\x00R\x07workdir\x12\x45\n\x0b\x63opy_config\x18\x07 \x01(\x0b\x32\".flyteidl2.imagebuilder.CopyConfigH\x00R\ncopyConfig\x12\x42\n\nuv_project\x18\x08 \x01(\x0b\x32!.flyteidl2.imagebuilder.UVProjectH\x00R\tuvProject\x12/\n\x03\x65nv\x18\t \x01(\x0b\x32\x1b.flyteidl2.imagebuilder.EnvH\x00R\x03\x65nv\x12N\n\x0epoetry_project\x18\n \x01(\x0b\x32%.flyteidl2.imagebuilder.PoetryProjectH\x00R\rpoetryProjectB\x07\n\x05layer\"\xa4\x01\n\tImageSpec\x12\x1d\n\nbase_image\x18\x01 \x01(\tR\tbaseImage\x12%\n\x0epython_version\x18\x02 \x01(\tR\rpythonVersion\x12\x35\n\x06layers\x18\x03 \x03(\x0b\x32\x1d.flyteidl2.imagebuilder.LayerR\x06layers\x12\x1a\n\x08platform\x18\x04 \x03(\tR\x08platformB\xe4\x01\n\x1a\x63om.flyteidl2.imagebuilderB\x0f\x44\x65\x66initionProtoH\x02P\x01Z:github.com/flyteorg/flyte/v2/gen/go/flyteidl2/imagebuilder\xa2\x02\x03\x46IX\xaa\x02\x16\x46lyteidl2.Imagebuilder\xca\x02\x16\x46lyteidl2\\Imagebuilder\xe2\x02\"Flyteidl2\\Imagebuilder\\GPBMetadata\xea\x02\x17\x46lyteidl2::Imagebuilderb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'flyteidl2/imagebuilder/definition.proto\x12\x16\x66lyteidl2.imagebuilder\x1a\x1b\x62uf/validate/validate.proto\x1a\x1d\x66lyteidl2/core/security.proto\"N\n\x0fImageIdentifier\x12\x1b\n\x04name\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04name\x12\x1e\n\nrepository\x18\x02 \x01(\tR\nrepository\"T\n\x05Image\x12\x37\n\x02id\x18\x01 \x01(\x0b\x32\'.flyteidl2.imagebuilder.ImageIdentifierR\x02id\x12\x12\n\x04\x66qin\x18\x02 \x01(\tR\x04\x66qin\"f\n\x0b\x41ptPackages\x12\x1a\n\x08packages\x18\x01 \x03(\tR\x08packages\x12;\n\rsecret_mounts\x18\x02 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"\x84\x01\n\nPipOptions\x12\x1b\n\tindex_url\x18\x02 \x01(\tR\x08indexUrl\x12(\n\x10\x65xtra_index_urls\x18\x03 \x03(\tR\x0e\x65xtraIndexUrls\x12\x10\n\x03pre\x18\x04 \x01(\x08R\x03pre\x12\x1d\n\nextra_args\x18\x05 \x01(\tR\textraArgs\"\xa4\x01\n\x0bPipPackages\x12\x1a\n\x08packages\x18\x01 \x03(\tR\x08packages\x12<\n\x07options\x18\x02 \x01(\x0b\x32\".flyteidl2.imagebuilder.PipOptionsR\x07options\x12;\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"\x9d\x01\n\x0cRequirements\x12\x12\n\x04\x66ile\x18\x01 \x01(\tR\x04\x66ile\x12<\n\x07options\x18\x02 \x01(\x0b\x32\".flyteidl2.imagebuilder.PipOptionsR\x07options\x12;\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"\xbe\x01\n\x0cPythonWheels\x12\x10\n\x03\x64ir\x18\x01 \x01(\tR\x03\x64ir\x12<\n\x07options\x18\x02 \x01(\x0b\x32\".flyteidl2.imagebuilder.PipOptionsR\x07options\x12;\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\x12!\n\x0cpackage_name\x18\x04 \x01(\tR\x0bpackageName\"\xdb\x01\n\tUVProject\x12\x1c\n\tpyproject\x18\x01 \x01(\tR\tpyproject\x12\x16\n\x06uvlock\x18\x02 \x01(\tR\x06uvlock\x12<\n\x07options\x18\x03 \x01(\x0b\x32\".flyteidl2.imagebuilder.PipOptionsR\x07options\x12;\n\rsecret_mounts\x18\x04 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\x12\x1d\n\nsource_dir\x18\x05 \x01(\tR\tsourceDir\"Y\n\x08\x43ommands\x12\x10\n\x03\x63md\x18\x02 \x03(\tR\x03\x63md\x12;\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"#\n\x07WorkDir\x12\x18\n\x07workdir\x18\x01 \x01(\tR\x07workdir\"0\n\nCopyConfig\x12\x10\n\x03src\x18\x01 \x01(\tR\x03src\x12\x10\n\x03\x64st\x18\x02 \x01(\tR\x03\x64st\"\x9a\x01\n\x03\x45nv\x12R\n\renv_variables\x18\x01 \x03(\x0b\x32-.flyteidl2.imagebuilder.Env.EnvVariablesEntryR\x0c\x65nvVariables\x1a?\n\x11\x45nvVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xaa\x01\n\rPoetryProject\x12\x1c\n\tpyproject\x18\x01 \x01(\tR\tpyproject\x12\x1f\n\x0bpoetry_lock\x18\x02 \x01(\tR\npoetryLock\x12\x1d\n\nextra_args\x18\x03 \x01(\tR\textraArgs\x12;\n\rsecret_mounts\x18\x04 \x03(\x0b\x32\x16.flyteidl2.core.SecretR\x0csecretMounts\"\xc6\x05\n\x05Layer\x12H\n\x0c\x61pt_packages\x18\x01 \x01(\x0b\x32#.flyteidl2.imagebuilder.AptPackagesH\x00R\x0b\x61ptPackages\x12H\n\x0cpip_packages\x18\x02 \x01(\x0b\x32#.flyteidl2.imagebuilder.PipPackagesH\x00R\x0bpipPackages\x12>\n\x08\x63ommands\x18\x03 \x01(\x0b\x32 .flyteidl2.imagebuilder.CommandsH\x00R\x08\x63ommands\x12J\n\x0crequirements\x18\x04 \x01(\x0b\x32$.flyteidl2.imagebuilder.RequirementsH\x00R\x0crequirements\x12K\n\rpython_wheels\x18\x05 \x01(\x0b\x32$.flyteidl2.imagebuilder.PythonWheelsH\x00R\x0cpythonWheels\x12;\n\x07workdir\x18\x06 \x01(\x0b\x32\x1f.flyteidl2.imagebuilder.WorkDirH\x00R\x07workdir\x12\x45\n\x0b\x63opy_config\x18\x07 \x01(\x0b\x32\".flyteidl2.imagebuilder.CopyConfigH\x00R\ncopyConfig\x12\x42\n\nuv_project\x18\x08 \x01(\x0b\x32!.flyteidl2.imagebuilder.UVProjectH\x00R\tuvProject\x12/\n\x03\x65nv\x18\t \x01(\x0b\x32\x1b.flyteidl2.imagebuilder.EnvH\x00R\x03\x65nv\x12N\n\x0epoetry_project\x18\n \x01(\x0b\x32%.flyteidl2.imagebuilder.PoetryProjectH\x00R\rpoetryProjectB\x07\n\x05layer\"\xa4\x01\n\tImageSpec\x12\x1d\n\nbase_image\x18\x01 \x01(\tR\tbaseImage\x12%\n\x0epython_version\x18\x02 \x01(\tR\rpythonVersion\x12\x35\n\x06layers\x18\x03 \x03(\x0b\x32\x1d.flyteidl2.imagebuilder.LayerR\x06layers\x12\x1a\n\x08platform\x18\x04 \x03(\tR\x08platformB\xe4\x01\n\x1a\x63om.flyteidl2.imagebuilderB\x0f\x44\x65\x66initionProtoH\x02P\x01Z:github.com/flyteorg/flyte/v2/gen/go/flyteidl2/imagebuilder\xa2\x02\x03\x46IX\xaa\x02\x16\x46lyteidl2.Imagebuilder\xca\x02\x16\x46lyteidl2\\Imagebuilder\xe2\x02\"Flyteidl2\\Imagebuilder\\GPBMetadata\xea\x02\x17\x46lyteidl2::Imagebuilderb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -28,35 +28,35 @@ _ENV_ENVVARIABLESENTRY._options = None _ENV_ENVVARIABLESENTRY._serialized_options = b'8\001' _globals['_IMAGEIDENTIFIER']._serialized_start=127 - _globals['_IMAGEIDENTIFIER']._serialized_end=173 - _globals['_IMAGE']._serialized_start=175 - _globals['_IMAGE']._serialized_end=259 - _globals['_APTPACKAGES']._serialized_start=261 - _globals['_APTPACKAGES']._serialized_end=363 - _globals['_PIPOPTIONS']._serialized_start=366 - _globals['_PIPOPTIONS']._serialized_end=498 - _globals['_PIPPACKAGES']._serialized_start=501 - _globals['_PIPPACKAGES']._serialized_end=665 - _globals['_REQUIREMENTS']._serialized_start=668 - _globals['_REQUIREMENTS']._serialized_end=825 - _globals['_PYTHONWHEELS']._serialized_start=828 - _globals['_PYTHONWHEELS']._serialized_end=1018 - _globals['_UVPROJECT']._serialized_start=1021 - _globals['_UVPROJECT']._serialized_end=1240 - _globals['_COMMANDS']._serialized_start=1242 - _globals['_COMMANDS']._serialized_end=1331 - _globals['_WORKDIR']._serialized_start=1333 - _globals['_WORKDIR']._serialized_end=1368 - _globals['_COPYCONFIG']._serialized_start=1370 - _globals['_COPYCONFIG']._serialized_end=1418 - _globals['_ENV']._serialized_start=1421 - _globals['_ENV']._serialized_end=1575 - _globals['_ENV_ENVVARIABLESENTRY']._serialized_start=1512 - _globals['_ENV_ENVVARIABLESENTRY']._serialized_end=1575 - _globals['_POETRYPROJECT']._serialized_start=1578 - _globals['_POETRYPROJECT']._serialized_end=1748 - _globals['_LAYER']._serialized_start=1751 - _globals['_LAYER']._serialized_end=2461 - _globals['_IMAGESPEC']._serialized_start=2464 - _globals['_IMAGESPEC']._serialized_end=2628 + _globals['_IMAGEIDENTIFIER']._serialized_end=205 + _globals['_IMAGE']._serialized_start=207 + _globals['_IMAGE']._serialized_end=291 + _globals['_APTPACKAGES']._serialized_start=293 + _globals['_APTPACKAGES']._serialized_end=395 + _globals['_PIPOPTIONS']._serialized_start=398 + _globals['_PIPOPTIONS']._serialized_end=530 + _globals['_PIPPACKAGES']._serialized_start=533 + _globals['_PIPPACKAGES']._serialized_end=697 + _globals['_REQUIREMENTS']._serialized_start=700 + _globals['_REQUIREMENTS']._serialized_end=857 + _globals['_PYTHONWHEELS']._serialized_start=860 + _globals['_PYTHONWHEELS']._serialized_end=1050 + _globals['_UVPROJECT']._serialized_start=1053 + _globals['_UVPROJECT']._serialized_end=1272 + _globals['_COMMANDS']._serialized_start=1274 + _globals['_COMMANDS']._serialized_end=1363 + _globals['_WORKDIR']._serialized_start=1365 + _globals['_WORKDIR']._serialized_end=1400 + _globals['_COPYCONFIG']._serialized_start=1402 + _globals['_COPYCONFIG']._serialized_end=1450 + _globals['_ENV']._serialized_start=1453 + _globals['_ENV']._serialized_end=1607 + _globals['_ENV_ENVVARIABLESENTRY']._serialized_start=1544 + _globals['_ENV_ENVVARIABLESENTRY']._serialized_end=1607 + _globals['_POETRYPROJECT']._serialized_start=1610 + _globals['_POETRYPROJECT']._serialized_end=1780 + _globals['_LAYER']._serialized_start=1783 + _globals['_LAYER']._serialized_end=2493 + _globals['_IMAGESPEC']._serialized_start=2496 + _globals['_IMAGESPEC']._serialized_end=2660 # @@protoc_insertion_point(module_scope) diff --git a/gen/python/flyteidl2/imagebuilder/definition_pb2.pyi b/gen/python/flyteidl2/imagebuilder/definition_pb2.pyi index 789c406008..52ca690551 100644 --- a/gen/python/flyteidl2/imagebuilder/definition_pb2.pyi +++ b/gen/python/flyteidl2/imagebuilder/definition_pb2.pyi @@ -8,10 +8,12 @@ from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Map DESCRIPTOR: _descriptor.FileDescriptor class ImageIdentifier(_message.Message): - __slots__ = ["name"] + __slots__ = ["name", "repository"] NAME_FIELD_NUMBER: _ClassVar[int] + REPOSITORY_FIELD_NUMBER: _ClassVar[int] name: str - def __init__(self, name: _Optional[str] = ...) -> None: ... + repository: str + def __init__(self, name: _Optional[str] = ..., repository: _Optional[str] = ...) -> None: ... class Image(_message.Message): __slots__ = ["id", "fqin"]