diff --git a/Makefile b/Makefile index eaf9b0abab..2d9fdf1e5d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ export REPOSITORY=flyte +export REPO_ROOT := $(shell pwd) include boilerplate/flyte/end2end/Makefile include boilerplate/flyte/golang_test_targets/Makefile @@ -136,8 +137,8 @@ go-tidy: make -C flytestdlib go-tidy make -C flytecopilot go-tidy -.PHONY: gen -gen: +.PHONY: generate +generate: make -C flyteidl generate make -C flyteadmin generate make -C flytepropeller generate diff --git a/boilerplate/flyte/golang_test_targets/Makefile b/boilerplate/flyte/golang_test_targets/Makefile index c02409a318..c89e471740 100644 --- a/boilerplate/flyte/golang_test_targets/Makefile +++ b/boilerplate/flyte/golang_test_targets/Makefile @@ -4,10 +4,11 @@ # TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst LINT_FLAGS ?= +export REPO_ROOT ?= $(shell pwd) .PHONY: download_tooling download_tooling: #download dependencies (including test deps) for the package - @../boilerplate/flyte/golang_test_targets/download_tooling.sh + @${REPO_ROOT}/boilerplate/flyte/golang_test_targets/download_tooling.sh .PHONY: generate generate: download_tooling #generate go code diff --git a/boilerplate/flyte/golang_test_targets/download_tooling.sh b/boilerplate/flyte/golang_test_targets/download_tooling.sh index 5ba5c6d1da..64a30bf07a 100755 --- a/boilerplate/flyte/golang_test_targets/download_tooling.sh +++ b/boilerplate/flyte/golang_test_targets/download_tooling.sh @@ -30,7 +30,7 @@ cp $REPO_ROOT/flytestdlib/bin/pflags $(go env GOPATH)/bin tmp_dir=$(mktemp -d -t gotooling-XXX) echo "Using temp directory ${tmp_dir}" -cp -R ../boilerplate/flyte/golang_support_tools/* $tmp_dir +cp -R $REPO_ROOT/boilerplate/flyte/golang_support_tools/* $tmp_dir pushd "$tmp_dir" for tool in "${tools[@]}"; do diff --git a/datacatalog/Makefile b/datacatalog/Makefile index e4e9b72c42..59258bb4df 100644 --- a/datacatalog/Makefile +++ b/datacatalog/Makefile @@ -1,5 +1,5 @@ export REPOSITORY=datacatalog -export REPO_ROOT=.. +export REPO_ROOT ?= $(shell pwd)/../ include ../boilerplate/flyte/docker_build/Makefile include ../boilerplate/flyte/golang_test_targets/Makefile diff --git a/flyteadmin/Makefile b/flyteadmin/Makefile index fad51a2edf..f35dee522f 100644 --- a/flyteadmin/Makefile +++ b/flyteadmin/Makefile @@ -1,6 +1,6 @@ export REPOSITORY=flyteadmin export FLYTE_SCHEDULER_REPOSITORY=flytescheduler -export REPO_ROOT=.. +export REPO_ROOT ?= $(shell pwd)/../ include ../boilerplate/flyte/docker_build/Makefile include ../boilerplate/flyte/golang_test_targets/Makefile include ../boilerplate/flyte/end2end/Makefile diff --git a/flytecopilot/Makefile b/flytecopilot/Makefile index 8a21a884ff..db8f2b8bbf 100755 --- a/flytecopilot/Makefile +++ b/flytecopilot/Makefile @@ -1,5 +1,5 @@ export REPOSITORY=flytecopilot -export REPO_ROOT=.. +export REPO_ROOT ?= $(shell pwd)/../ include ../boilerplate/flyte/docker_build/Makefile include ../boilerplate/flyte/golang_test_targets/Makefile diff --git a/flytectl/Makefile b/flytectl/Makefile index 17c8b5f2bc..240523f346 100644 --- a/flytectl/Makefile +++ b/flytectl/Makefile @@ -1,5 +1,5 @@ export REPOSITORY=flytectl -export REPO_ROOT=.. +export REPO_ROOT ?= $(shell pwd)/../ include ../boilerplate/flyte/docker_build/Makefile include ../boilerplate/flyte/golang_test_targets/Makefile include ../boilerplate/flyte/end2end/Makefile diff --git a/flyteidl/Makefile b/flyteidl/Makefile index aad8a5c6b5..ffeb7dcbfb 100644 --- a/flyteidl/Makefile +++ b/flyteidl/Makefile @@ -1,5 +1,5 @@ export REPOSITORY=flyteidl -export REPO_ROOT=.. +export REPO_ROOT ?= $(shell pwd)/../ include ../boilerplate/flyte/golang_test_targets/Makefile define PIP_COMPILE diff --git a/flyteidl/clients/go/assets/admin.swagger.json b/flyteidl/clients/go/assets/admin.swagger.json index 3b0e997ee6..0fd1f8be8d 100644 --- a/flyteidl/clients/go/assets/admin.swagger.json +++ b/flyteidl/clients/go/assets/admin.swagger.json @@ -4034,454 +4034,6 @@ } }, "definitions": { -<<<<<<< HEAD - "AdminServiceCreateExecutionBody": { - "type": "object", - "properties": { - "project": { - "type": "string", - "title": "Name of the project the execution belongs to.\n+required" - }, - "domain": { - "type": "string", - "title": "Name of the domain the execution belongs to.\nA domain can be considered as a subset within a specific project.\n+required" - }, - "name": { - "type": "string", - "title": "User provided value for the resource.\nIf none is provided the system will generate a unique string.\n+optional" - }, - "spec": { - "$ref": "#/definitions/adminExecutionSpec", - "title": "Additional fields necessary to launch the execution.\n+optional" - }, - "inputs": { - "$ref": "#/definitions/coreLiteralMap", - "description": "The inputs required to start the execution. All required inputs must be\nincluded in this map. If not required and not provided, defaults apply.\n+optional\nDeprecated: Please use input_data instead." - }, - "input_data": { - "$ref": "#/definitions/coreInputData", - "title": "The inputs required to start the execution. All required inputs must be\nincluded in this map. If not required and not provided, defaults apply.\n+optional" - } - }, - "description": "Request to launch an execution with the given project, domain and optionally-assigned name." - }, - "AdminServiceCreateLaunchPlanBody": { - "type": "object", - "properties": { - "id": { - "type": "object", - "properties": { - "resource_type": { - "$ref": "#/definitions/coreResourceType", - "description": "Identifies the specific type of resource that this identifier corresponds to." - }, - "project": { - "type": "string", - "description": "Name of the project the resource belongs to." - }, - "domain": { - "type": "string", - "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project." - }, - "name": { - "type": "string", - "description": "User provided value for the resource." - }, - "version": { - "type": "string", - "description": "Specific version of the resource." - } - }, - "description": "Uniquely identifies a launch plan entity.", - "title": "Uniquely identifies a launch plan entity." - }, - "spec": { - "$ref": "#/definitions/adminLaunchPlanSpec", - "description": "User-provided launch plan details, including reference workflow, inputs and other metadata." - } - }, - "description": "Request to register a launch plan. The included LaunchPlanSpec may have a complete or incomplete set of inputs required\nto launch a workflow execution. By default all launch plans are registered in state INACTIVE. If you wish to\nset the state to ACTIVE, you must submit a LaunchPlanUpdateRequest, after you have successfully created a launch plan." - }, - "AdminServiceCreateNodeEventBody": { - "type": "object", - "properties": { - "request_id": { - "type": "string", - "title": "Unique ID for this request that can be traced between services" - }, - "event": { - "type": "object", - "properties": { - "id": { - "type": "object", - "properties": { - "node_id": { - "type": "string" - }, - "execution_id": { - "type": "object", - "properties": { - "project": { - "type": "string", - "description": "Name of the project the resource belongs to." - }, - "domain": { - "type": "string", - "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project." - }, - "name": { - "type": "string", - "description": "User or system provided value for the resource." - } - }, - "title": "Encapsulation of fields that uniquely identifies a Flyte workflow execution" - } - }, - "title": "Unique identifier for this node execution" - }, - "producer_id": { - "type": "string", - "title": "the id of the originator (Propeller) of the event" - }, - "phase": { - "$ref": "#/definitions/coreNodeExecutionPhase" - }, - "occurred_at": { - "type": "string", - "format": "date-time", - "description": "This timestamp represents when the original event occurred, it is generated\nby the executor of the node." - }, - "input_uri": { - "type": "string" - }, - "deprecated_input_data": { - "$ref": "#/definitions/coreLiteralMap", - "title": "Raw input data consumed by this node execution.\nDeprecated: please use input_data instead" - }, - "input_data": { - "$ref": "#/definitions/coreInputData", - "description": "Raw input data consumed by this node execution." - }, - "output_uri": { - "type": "string", - "description": "URL to the output of the execution, it encodes all the information\nincluding Cloud source provider. ie., s3://..." - }, - "error": { - "$ref": "#/definitions/coreExecutionError", - "title": "Error information for the execution" - }, - "deprecated_output_data": { - "$ref": "#/definitions/coreLiteralMap", - "title": "Raw output data produced by this workflow execution.\nDeprecated: please use output_data instead" - }, - "output_data": { - "$ref": "#/definitions/coreOutputData", - "description": "Raw output data produced by this workflow execution." - }, - "workflow_node_metadata": { - "$ref": "#/definitions/flyteidleventWorkflowNodeMetadata" - }, - "task_node_metadata": { - "$ref": "#/definitions/flyteidleventTaskNodeMetadata" - }, - "parent_task_metadata": { - "$ref": "#/definitions/eventParentTaskExecutionMetadata", - "description": "[To be deprecated] Specifies which task (if any) launched this node." - }, - "parent_node_metadata": { - "$ref": "#/definitions/eventParentNodeExecutionMetadata", - "description": "Specifies the parent node of the current node execution. Node executions at level zero will not have a parent node." - }, - "retry_group": { - "type": "string", - "title": "Retry group to indicate grouping of nodes by retries" - }, - "spec_node_id": { - "type": "string", - "title": "Identifier of the node in the original workflow/graph\nThis maps to value of WorkflowTemplate.nodes[X].id" - }, - "node_name": { - "type": "string", - "title": "Friendly readable name for the node" - }, - "event_version": { - "type": "integer", - "format": "int32" - }, - "is_parent": { - "type": "boolean", - "description": "Whether this node launched a subworkflow." - }, - "is_dynamic": { - "type": "boolean", - "description": "Whether this node yielded a dynamic workflow." - }, - "deck_uri": { - "type": "string", - "title": "String location uniquely identifying where the deck HTML file is\nNativeUrl specifies the url in the format of the configured storage provider (e.g. s3://my-bucket/randomstring/suffix.tar)" - }, - "reported_at": { - "type": "string", - "format": "date-time", - "description": "This timestamp represents the instant when the event was reported by the executing framework. For example,\nwhen first processing a node the `occurred_at` timestamp should be the instant propeller makes progress, so when\nliteral inputs are initially copied. The event however will not be sent until after the copy completes.\nExtracting both of these timestamps facilitates a more accurate portrayal of the evaluation time-series." - }, - "is_array": { - "type": "boolean", - "description": "Indicates if this node is an ArrayNode." - } - }, - "description": "Details about the event that occurred.", - "title": "Details about the event that occurred." - } - }, - "description": "Request to send a notification that a node execution event has occurred." - }, - "AdminServiceCreateTaskEventBody": { - "type": "object", - "properties": { - "request_id": { - "type": "string", - "title": "Unique ID for this request that can be traced between services" - }, - "event": { - "type": "object", - "properties": { - "task_id": { - "$ref": "#/definitions/coreIdentifier", - "description": "ID of the task. In combination with the retryAttempt this will indicate\nthe task execution uniquely for a given parent node execution." - }, - "parent_node_execution_id": { - "type": "object", - "properties": { - "node_id": { - "type": "string" - }, - "execution_id": { - "type": "object", - "properties": { - "project": { - "type": "string", - "description": "Name of the project the resource belongs to." - }, - "domain": { - "type": "string", - "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project." - }, - "name": { - "type": "string", - "description": "User or system provided value for the resource." - } - }, - "title": "Encapsulation of fields that uniquely identifies a Flyte workflow execution" - } - }, - "title": "A task execution is always kicked off by a node execution, the event consumer\nwill use the parent_id to relate the task to it's parent node execution" - }, - "retry_attempt": { - "type": "integer", - "format": "int64", - "title": "retry attempt number for this task, ie., 2 for the second attempt" - }, - "phase": { - "$ref": "#/definitions/coreTaskExecutionPhase", - "title": "Phase associated with the event" - }, - "producer_id": { - "type": "string", - "title": "id of the process that sent this event, mainly for trace debugging" - }, - "logs": { - "type": "array", - "items": { - "type": "object", - "$ref": "#/definitions/coreTaskLog" - }, - "title": "log information for the task execution" - }, - "occurred_at": { - "type": "string", - "format": "date-time", - "description": "This timestamp represents when the original event occurred, it is generated\nby the executor of the task." - }, - "input_uri": { - "type": "string", - "description": "URI of the input file, it encodes all the information\nincluding Cloud source provider. ie., s3://..." - }, - "deprecated_input_data": { - "$ref": "#/definitions/coreLiteralMap", - "title": "Raw input data consumed by this node execution.\nDeprecated: please use input_data instead" - }, - "input_data": { - "$ref": "#/definitions/coreInputData", - "description": "Raw input data consumed by this node execution." - }, - "output_uri": { - "type": "string", - "description": "URI to the output of the execution, it will be in a format that encodes all the information\nincluding Cloud source provider. ie., s3://..." - }, - "error": { - "$ref": "#/definitions/coreExecutionError", - "title": "Error information for the execution" - }, - "deprecated_output_data": { - "$ref": "#/definitions/coreLiteralMap", - "title": "Raw output data produced by this workflow execution.\nDeprecated: please use output_data instead" - }, - "output_data": { - "$ref": "#/definitions/coreOutputData", - "description": "Raw output data produced by this workflow execution." - }, - "custom_info": { - "type": "object", - "description": "Custom data that the task plugin sends back. This is extensible to allow various plugins in the system." - }, - "phase_version": { - "type": "integer", - "format": "int64", - "description": "Some phases, like RUNNING, can send multiple events with changed metadata (new logs, additional custom_info, etc)\nthat should be recorded regardless of the lack of phase change.\nThe version field should be incremented when metadata changes across the duration of an individual phase." - }, - "reason": { - "type": "string", - "description": "An optional explanation for the phase transition.\nDeprecated: Use reasons instead." - }, - "reasons": { - "type": "array", - "items": { - "type": "object", - "$ref": "#/definitions/eventEventReason" - }, - "description": "An optional list of explanations for the phase transition." - }, - "task_type": { - "type": "string", - "description": "A predefined yet extensible Task type identifier. If the task definition is already registered in flyte admin\nthis type will be identical, but not all task executions necessarily use pre-registered definitions and this\ntype is useful to render the task in the UI, filter task executions, etc." - }, - "metadata": { - "$ref": "#/definitions/flyteidleventTaskExecutionMetadata", - "description": "Metadata around how a task was executed." - }, - "event_version": { - "type": "integer", - "format": "int32", - "description": "The event version is used to indicate versioned changes in how data is reported using this\nproto message. For example, event_verison \u003e 0 means that maps tasks report logs using the\nTaskExecutionMetadata ExternalResourceInfo fields for each subtask rather than the TaskLog\nin this message." - }, - "reported_at": { - "type": "string", - "format": "date-time", - "description": "This timestamp represents the instant when the event was reported by the executing framework. For example, a k8s\npod task may be marked completed at (ie. `occurred_at`) the instant the container running user code completes,\nbut this event will not be reported until the pod is marked as completed. Extracting both of these timestamps\nfacilitates a more accurate portrayal of the evaluation time-series." - } - }, - "description": "Details about the event that occurred.", - "title": "Details about the event that occurred." - } - }, - "description": "Request to send a notification that a task execution event has occurred." - }, - "AdminServiceCreateWorkflowBody": { - "type": "object", - "properties": { - "id": { - "type": "object", - "properties": { - "resource_type": { - "$ref": "#/definitions/coreResourceType", - "description": "Identifies the specific type of resource that this identifier corresponds to." - }, - "project": { - "type": "string", - "description": "Name of the project the resource belongs to." - }, - "domain": { - "type": "string", - "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project." - }, - "name": { - "type": "string", - "description": "User provided value for the resource." - }, - "version": { - "type": "string", - "description": "Specific version of the resource." - } - }, - "title": "id represents the unique identifier of the workflow.\n+required" - }, - "spec": { - "$ref": "#/definitions/adminWorkflowSpec", - "title": "Represents the specification for workflow.\n+required" - } - }, - "title": "Represents a request structure to create a revision of a workflow.\nSee :ref:`ref_flyteidl.admin.Workflow` for more details" - }, - "AdminServiceCreateWorkflowEventBody": { - "type": "object", - "properties": { - "request_id": { - "type": "string", - "title": "Unique ID for this request that can be traced between services" - }, - "event": { - "type": "object", - "properties": { - "execution_id": { - "type": "object", - "properties": { - "project": { - "type": "string", - "description": "Name of the project the resource belongs to." - }, - "domain": { - "type": "string", - "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project." - }, - "name": { - "type": "string", - "description": "User or system provided value for the resource." - } - }, - "title": "Workflow execution id" - }, - "producer_id": { - "type": "string", - "title": "the id of the originator (Propeller) of the event" - }, - "phase": { - "$ref": "#/definitions/coreWorkflowExecutionPhase" - }, - "occurred_at": { - "type": "string", - "format": "date-time", - "description": "This timestamp represents when the original event occurred, it is generated\nby the executor of the workflow." - }, - "output_uri": { - "type": "string", - "description": "URL to the output of the execution, it encodes all the information\nincluding Cloud source provider. ie., s3://..." - }, - "error": { - "$ref": "#/definitions/coreExecutionError", - "title": "Error information for the execution" - }, - "deprecated_output_data": { - "$ref": "#/definitions/coreLiteralMap", - "title": "Raw output data produced by this workflow execution.\nDeprecated: please use output_data instead" - }, - "output_data": { - "$ref": "#/definitions/coreOutputData", - "description": "Raw output data produced by this workflow execution." - }, - "event_version": { - "type": "integer", - "format": "int32" - } - }, - "description": "Details about the event that occurred.", - "title": "Details about the event that occurred." - } - }, - "description": "Request to send a notification that a workflow execution event has occurred." - }, -======= ->>>>>>> 2407e906c9efc2b5b3bb26bf1fe298277abf4a62 "AdminServiceDeleteProjectAttributesBody": { "type": "object", "properties": { @@ -5747,10 +5299,6 @@ "$ref": "#/definitions/coreLiteralMap", "title": "Fixed, non-overridable inputs for the Launch Plan.\nThese can not be overridden when an execution is created with this launch plan.\nDeprecated: Please use fixec_input_data instead" }, - "fixed_input_data": { - "$ref": "#/definitions/coreInputData", - "description": "Fixed, non-overridable inputs for the Launch Plan.\nThese can not be overridden when an execution is created with this launch plan." - }, "role": { "type": "string", "title": "String to indicate the role to use to execute the workflow underneath" @@ -5806,6 +5354,10 @@ "$ref": "#/definitions/coreExecutionEnvAssignment" }, "description": "Execution environment assignments to be set for the execution." + }, + "fixed_input_data": { + "$ref": "#/definitions/coreInputData", + "description": "Fixed, non-overridable inputs for the Launch Plan.\nThese can not be overridden when an execution is created with this launch plan." } }, "description": "User-provided launch plan definition and configuration values." @@ -7551,19 +7103,6 @@ }, "description": "This configuration allows executing raw containers in Flyte using the Flyte CoPilot system.\nFlyte CoPilot, eliminates the needs of flytekit or sdk inside the container. Any inputs required by the users container are side-loaded in the input_path\nAny outputs generated by the user container - within output_path are automatically uploaded." }, - "coreEnumType": { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "type": "string" - }, - "description": "Predefined set of enum values." - } - }, - "description": "Enables declaring enum types, with predefined string values\nFor len(values) \u003e 0, the first value in the ordered list is regarded as the default value. If you wish\nTo provide no defaults, make the first value as undefined." - }, "coreError": { "type": "object", "properties": { @@ -7982,7 +7521,7 @@ "description": "A blob might have specialized implementation details depending on associated metadata." }, "enum_type": { - "$ref": "#/definitions/coreEnumType", + "$ref": "#/definitions/flyteidlcoreEnumType", "description": "Defines an enum with pre-defined string values." }, "structured_dataset_type": { @@ -9554,6 +9093,19 @@ }, "title": "Metadata for a WorkflowNode" }, + "flyteidlcoreEnumType": { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Predefined set of enum values." + } + }, + "description": "Enables declaring enum types, with predefined string values\nFor len(values) \u003e 0, the first value in the ordered list is regarded as the default value. If you wish\nTo provide no defaults, make the first value as undefined." + }, "flyteidlcoreKeyValuePair": { "type": "object", "properties": { @@ -9697,11 +9249,11 @@ "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.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." + "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\nExample 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\nExample 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 }" + "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 }" }, "protobufNullValue": { "type": "string", @@ -9709,47 +9261,7 @@ "NULL_VALUE" ], "default": "NULL_VALUE", -<<<<<<< HEAD - "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." - }, - "serviceAdminServiceCreateTaskBody": { - "type": "object", - "properties": { - "id": { - "type": "object", - "properties": { - "resource_type": { - "$ref": "#/definitions/coreResourceType", - "description": "Identifies the specific type of resource that this identifier corresponds to." - }, - "project": { - "type": "string", - "description": "Name of the project the resource belongs to." - }, - "domain": { - "type": "string", - "description": "Name of the domain the resource belongs to.\nA domain can be considered as a subset within a specific project." - }, - "name": { - "type": "string", - "description": "User provided value for the resource." - }, - "version": { - "type": "string", - "description": "Specific version of the resource." - } - }, - "title": "id represents the unique identifier of the task.\n+required" - }, - "spec": { - "$ref": "#/definitions/adminTaskSpec", - "title": "Represents the specification for task.\n+required" - } - }, - "title": "Represents a request structure to create a revision of a task.\nSee :ref:`ref_flyteidl.admin.Task` for more details" -======= "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\nThe JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." ->>>>>>> 2407e906c9efc2b5b3bb26bf1fe298277abf4a62 } } } diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 136b9757b9..82cc68c027 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -10042,9 +10042,6 @@ export namespace flyteidl { /** Resource deprecatedOutputs */ deprecatedOutputs?: (flyteidl.core.ILiteralMap|null); - /** Resource outputs */ - outputs?: (flyteidl.core.IOutputData|null); - /** Resource message */ message?: (string|null); @@ -10056,6 +10053,9 @@ export namespace flyteidl { /** Resource customInfo */ customInfo?: (google.protobuf.IStruct|null); + + /** Resource outputs */ + outputs?: (flyteidl.core.IOutputData|null); } /** Represents a Resource. */ @@ -10073,9 +10073,6 @@ export namespace flyteidl { /** Resource deprecatedOutputs. */ public deprecatedOutputs?: (flyteidl.core.ILiteralMap|null); - /** Resource outputs. */ - public outputs?: (flyteidl.core.IOutputData|null); - /** Resource message. */ public message: string; @@ -10088,6 +10085,9 @@ export namespace flyteidl { /** Resource customInfo. */ public customInfo?: (google.protobuf.IStruct|null); + /** Resource outputs. */ + public outputs?: (flyteidl.core.IOutputData|null); + /** * Creates a new Resource instance using the specified properties. * @param [properties] Properties to set @@ -16021,9 +16021,6 @@ export namespace flyteidl { /** LaunchPlanSpec fixedInputs */ fixedInputs?: (flyteidl.core.ILiteralMap|null); - /** LaunchPlanSpec fixedInputData */ - fixedInputData?: (flyteidl.core.IInputData|null); - /** LaunchPlanSpec role */ role?: (string|null); @@ -16062,6 +16059,9 @@ export namespace flyteidl { /** LaunchPlanSpec executionEnvAssignments */ executionEnvAssignments?: (flyteidl.core.IExecutionEnvAssignment[]|null); + + /** LaunchPlanSpec fixedInputData */ + fixedInputData?: (flyteidl.core.IInputData|null); } /** Represents a LaunchPlanSpec. */ @@ -16085,9 +16085,6 @@ export namespace flyteidl { /** LaunchPlanSpec fixedInputs. */ public fixedInputs?: (flyteidl.core.ILiteralMap|null); - /** LaunchPlanSpec fixedInputData. */ - public fixedInputData?: (flyteidl.core.IInputData|null); - /** LaunchPlanSpec role. */ public role: string; @@ -16127,6 +16124,9 @@ export namespace flyteidl { /** LaunchPlanSpec executionEnvAssignments. */ public executionEnvAssignments: flyteidl.core.IExecutionEnvAssignment[]; + /** LaunchPlanSpec fixedInputData. */ + public fixedInputData?: (flyteidl.core.IInputData|null); + /** * Creates a new LaunchPlanSpec instance using the specified properties. * @param [properties] Properties to set diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index ce2589996c..6d8b5c9d25 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -20896,17 +20896,14 @@ $root.google.protobuf.Timestamp.encode(message.reportedAt, writer.uint32(/* id 21, wireType 2 =*/170).fork()).ldelim(); if (message.isArray != null && message.hasOwnProperty("isArray")) writer.uint32(/* id 22, wireType 0 =*/176).bool(message.isArray); -<<<<<<< HEAD - if (message.outputData != null && message.hasOwnProperty("outputData")) - $root.flyteidl.core.OutputData.encode(message.outputData, writer.uint32(/* id 23, wireType 2 =*/186).fork()).ldelim(); - if (message.inputData != null && message.hasOwnProperty("inputData")) - $root.flyteidl.core.InputData.encode(message.inputData, writer.uint32(/* id 24, wireType 2 =*/194).fork()).ldelim(); -======= if (message.targetEntity != null && message.hasOwnProperty("targetEntity")) $root.flyteidl.core.Identifier.encode(message.targetEntity, writer.uint32(/* id 23, wireType 2 =*/186).fork()).ldelim(); if (message.isInDynamicChain != null && message.hasOwnProperty("isInDynamicChain")) writer.uint32(/* id 24, wireType 0 =*/192).bool(message.isInDynamicChain); ->>>>>>> 2407e906c9efc2b5b3bb26bf1fe298277abf4a62 + if (message.inputData != null && message.hasOwnProperty("inputData")) + $root.flyteidl.core.InputData.encode(message.inputData, writer.uint32(/* id 25, wireType 2 =*/202).fork()).ldelim(); + if (message.outputData != null && message.hasOwnProperty("outputData")) + $root.flyteidl.core.OutputData.encode(message.outputData, writer.uint32(/* id 26, wireType 2 =*/210).fork()).ldelim(); return writer; }; @@ -20946,7 +20943,7 @@ case 20: message.deprecatedInputData = $root.flyteidl.core.LiteralMap.decode(reader, reader.uint32()); break; - case 24: + case 25: message.inputData = $root.flyteidl.core.InputData.decode(reader, reader.uint32()); break; case 6: @@ -20958,7 +20955,7 @@ case 15: message.deprecatedOutputData = $root.flyteidl.core.LiteralMap.decode(reader, reader.uint32()); break; - case 23: + case 26: message.outputData = $root.flyteidl.core.OutputData.decode(reader, reader.uint32()); break; case 8: @@ -24646,11 +24643,11 @@ * @interface IResource * @property {flyteidl.admin.State|null} [state] Resource state * @property {flyteidl.core.ILiteralMap|null} [deprecatedOutputs] Resource deprecatedOutputs - * @property {flyteidl.core.IOutputData|null} [outputs] Resource outputs * @property {string|null} [message] Resource message * @property {Array.|null} [logLinks] Resource logLinks * @property {flyteidl.core.TaskExecution.Phase|null} [phase] Resource phase * @property {google.protobuf.IStruct|null} [customInfo] Resource customInfo + * @property {flyteidl.core.IOutputData|null} [outputs] Resource outputs */ /** @@ -24685,14 +24682,6 @@ */ Resource.prototype.deprecatedOutputs = null; - /** - * Resource outputs. - * @member {flyteidl.core.IOutputData|null|undefined} outputs - * @memberof flyteidl.admin.Resource - * @instance - */ - Resource.prototype.outputs = null; - /** * Resource message. * @member {string} message @@ -24725,6 +24714,14 @@ */ Resource.prototype.customInfo = null; + /** + * Resource outputs. + * @member {flyteidl.core.IOutputData|null|undefined} outputs + * @memberof flyteidl.admin.Resource + * @instance + */ + Resource.prototype.outputs = null; + /** * Creates a new Resource instance using the specified properties. * @function create @@ -24760,13 +24757,10 @@ $root.flyteidl.core.TaskLog.encode(message.logLinks[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); if (message.phase != null && message.hasOwnProperty("phase")) writer.uint32(/* id 5, wireType 0 =*/40).int32(message.phase); -<<<<<<< HEAD - if (message.outputs != null && message.hasOwnProperty("outputs")) - $root.flyteidl.core.OutputData.encode(message.outputs, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); -======= if (message.customInfo != null && message.hasOwnProperty("customInfo")) $root.google.protobuf.Struct.encode(message.customInfo, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); ->>>>>>> 2407e906c9efc2b5b3bb26bf1fe298277abf4a62 + if (message.outputs != null && message.hasOwnProperty("outputs")) + $root.flyteidl.core.OutputData.encode(message.outputs, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); return writer; }; @@ -24794,9 +24788,6 @@ case 2: message.deprecatedOutputs = $root.flyteidl.core.LiteralMap.decode(reader, reader.uint32()); break; - case 6: - message.outputs = $root.flyteidl.core.OutputData.decode(reader, reader.uint32()); - break; case 3: message.message = reader.string(); break; @@ -24811,6 +24802,9 @@ case 6: message.customInfo = $root.google.protobuf.Struct.decode(reader, reader.uint32()); break; + case 7: + message.outputs = $root.flyteidl.core.OutputData.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -24846,11 +24840,6 @@ if (error) return "deprecatedOutputs." + error; } - if (message.outputs != null && message.hasOwnProperty("outputs")) { - var error = $root.flyteidl.core.OutputData.verify(message.outputs); - if (error) - return "outputs." + error; - } if (message.message != null && message.hasOwnProperty("message")) if (!$util.isString(message.message)) return "message: string expected"; @@ -24882,6 +24871,11 @@ if (error) return "customInfo." + error; } + if (message.outputs != null && message.hasOwnProperty("outputs")) { + var error = $root.flyteidl.core.OutputData.verify(message.outputs); + if (error) + return "outputs." + error; + } return null; }; @@ -38833,7 +38827,6 @@ * @property {flyteidl.admin.ILaunchPlanMetadata|null} [entityMetadata] LaunchPlanSpec entityMetadata * @property {flyteidl.core.IParameterMap|null} [defaultInputs] LaunchPlanSpec defaultInputs * @property {flyteidl.core.ILiteralMap|null} [fixedInputs] LaunchPlanSpec fixedInputs - * @property {flyteidl.core.IInputData|null} [fixedInputData] LaunchPlanSpec fixedInputData * @property {string|null} [role] LaunchPlanSpec role * @property {flyteidl.admin.ILabels|null} [labels] LaunchPlanSpec labels * @property {flyteidl.admin.IAnnotations|null} [annotations] LaunchPlanSpec annotations @@ -38847,6 +38840,7 @@ * @property {boolean|null} [overwriteCache] LaunchPlanSpec overwriteCache * @property {flyteidl.admin.IEnvs|null} [envs] LaunchPlanSpec envs * @property {Array.|null} [executionEnvAssignments] LaunchPlanSpec executionEnvAssignments + * @property {flyteidl.core.IInputData|null} [fixedInputData] LaunchPlanSpec fixedInputData */ /** @@ -38897,14 +38891,6 @@ */ LaunchPlanSpec.prototype.fixedInputs = null; - /** - * LaunchPlanSpec fixedInputData. - * @member {flyteidl.core.IInputData|null|undefined} fixedInputData - * @memberof flyteidl.admin.LaunchPlanSpec - * @instance - */ - LaunchPlanSpec.prototype.fixedInputData = null; - /** * LaunchPlanSpec role. * @member {string} role @@ -39009,6 +38995,14 @@ */ LaunchPlanSpec.prototype.executionEnvAssignments = $util.emptyArray; + /** + * LaunchPlanSpec fixedInputData. + * @member {flyteidl.core.IInputData|null|undefined} fixedInputData + * @memberof flyteidl.admin.LaunchPlanSpec + * @instance + */ + LaunchPlanSpec.prototype.fixedInputData = null; + /** * Creates a new LaunchPlanSpec instance using the specified properties. * @function create @@ -39065,14 +39059,11 @@ writer.uint32(/* id 20, wireType 0 =*/160).bool(message.overwriteCache); if (message.envs != null && message.hasOwnProperty("envs")) $root.flyteidl.admin.Envs.encode(message.envs, writer.uint32(/* id 21, wireType 2 =*/170).fork()).ldelim(); -<<<<<<< HEAD - if (message.fixedInputData != null && message.hasOwnProperty("fixedInputData")) - $root.flyteidl.core.InputData.encode(message.fixedInputData, writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim(); -======= if (message.executionEnvAssignments != null && message.executionEnvAssignments.length) for (var i = 0; i < message.executionEnvAssignments.length; ++i) $root.flyteidl.core.ExecutionEnvAssignment.encode(message.executionEnvAssignments[i], writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim(); ->>>>>>> 2407e906c9efc2b5b3bb26bf1fe298277abf4a62 + if (message.fixedInputData != null && message.hasOwnProperty("fixedInputData")) + $root.flyteidl.core.InputData.encode(message.fixedInputData, writer.uint32(/* id 23, wireType 2 =*/186).fork()).ldelim(); return writer; }; @@ -39106,9 +39097,6 @@ case 4: message.fixedInputs = $root.flyteidl.core.LiteralMap.decode(reader, reader.uint32()); break; - case 22: - message.fixedInputData = $root.flyteidl.core.InputData.decode(reader, reader.uint32()); - break; case 5: message.role = reader.string(); break; @@ -39150,6 +39138,9 @@ message.executionEnvAssignments = []; message.executionEnvAssignments.push($root.flyteidl.core.ExecutionEnvAssignment.decode(reader, reader.uint32())); break; + case 23: + message.fixedInputData = $root.flyteidl.core.InputData.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -39189,11 +39180,6 @@ if (error) return "fixedInputs." + error; } - if (message.fixedInputData != null && message.hasOwnProperty("fixedInputData")) { - var error = $root.flyteidl.core.InputData.verify(message.fixedInputData); - if (error) - return "fixedInputData." + error; - } if (message.role != null && message.hasOwnProperty("role")) if (!$util.isString(message.role)) return "role: string expected"; @@ -39257,6 +39243,11 @@ return "executionEnvAssignments." + error; } } + if (message.fixedInputData != null && message.hasOwnProperty("fixedInputData")) { + var error = $root.flyteidl.core.InputData.verify(message.fixedInputData); + if (error) + return "fixedInputData." + error; + } return null; }; diff --git a/flyteplugins/Makefile b/flyteplugins/Makefile index 9861909e96..2bd8e5260a 100755 --- a/flyteplugins/Makefile +++ b/flyteplugins/Makefile @@ -1,5 +1,5 @@ export REPOSITORY=flyteplugins -export REPO_ROOT=.. +export REPO_ROOT ?= $(shell pwd)/../ include ../boilerplate/flyte/docker_build/Makefile include ../boilerplate/flyte/golang_test_targets/Makefile diff --git a/flytepropeller/Makefile b/flytepropeller/Makefile index 351ff9ed03..09b59d305f 100644 --- a/flytepropeller/Makefile +++ b/flytepropeller/Makefile @@ -1,5 +1,5 @@ export REPOSITORY=flytepropeller -export REPO_ROOT=.. +export REPO_ROOT ?= $(shell pwd)/../ include ../boilerplate/flyte/docker_build/Makefile include ../boilerplate/flyte/golang_test_targets/Makefile include ../boilerplate/flyte/end2end/Makefile diff --git a/flytestdlib/Makefile b/flytestdlib/Makefile index 2e862291c7..eeba9f0a32 100644 --- a/flytestdlib/Makefile +++ b/flytestdlib/Makefile @@ -1,5 +1,5 @@ export REPOSITORY=flytestdlib -export REPO_ROOT=.. +export REPO_ROOT ?= $(shell pwd)/../ include ../boilerplate/flyte/golang_test_targets/Makefile .PHONY: update_boilerplate