fix test

Signed-off-by: Kevin Su <[email protected]>
flyteorg · pingsutw · Mar 27, 2024 · Mar 27, 2024 · Mar 27, 2024 · Mar 27, 2024
commit 22966d01e9af82ee5c23f11667aceff957cdf314
diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context.go b/flyteplugins/go/tasks/pluginmachinery/webapi/mocks/task_execution_context.go
diff --git a/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow_test.go b/flytepropeller/pkg/controller/nodes/dynamic/dynamic_workflow_test.go
@@ -496,7 +496,7 @@ func Test_dynamicNodeHandler_buildContextualDynamicWorkflow_withLaunchPlans(t *t
 		composedPBStore.OnWriteRawMatch(
 			mock.MatchedBy(func(ctx context.Context) bool { return true }),
 			storage.DataReference("s3://my-s3-bucket/foo/bar/futures_compiled.pb"),
-			int64(1501),
+			int64(1550),
 			storage.Options{},
 			mock.MatchedBy(func(rdr *bytes.Reader) bool { return true })).Return(errors.New("foo"))
 

diff --git a/flyteadmin/pkg/manager/impl/execution_manager.go b/flyteadmin/pkg/manager/impl/execution_manager.go
 func (m *ExecutionManager) getExternalResourceAttributes(ctx context.Context, request *admin.ExecutionCreateRequest) (
 	*admin.ExternalResourceAttributes, error) {
 	if request.Spec.ExternalResourceAttributes != nil {
 		return request.Spec.ExternalResourceAttributes, nil
 	}

 	resource, err := m.resourceManager.GetResource(ctx, interfaces.ResourceRequest{
 		ResourceType: admin.MatchableResource_EXTERNAL_RESOURCE,
 	})
 	if err != nil && !errors.IsDoesNotExistError(err) {
 		logger.Errorf(ctx, "Failed to get external resource with error: %v", err)
 		return nil, err
 	}
 	if resource != nil && resource.Attributes.GetExternalResourceAttributes() != nil {
 		return resource.Attributes.GetExternalResourceAttributes(), nil
 	}

 	externalResource := m.config.ExternalResourceConfiguration().GetExternalResource()
 	connections := make(map[string]*core.Connection)
 	for key, connection := range externalResource.Connections {
 		connections[key] = &core.Connection{
 			Secrets: connection.Secrets,
 			Configs: connection.Configs,
 		}
 	}


 	externalResourceAttribute, err := m.getExternalResourceAttributes(ctx, &request)
 	if err != nil {
 		return nil, nil, err
 	}

 	var executionClusterLabel *admin.ExecutionClusterLabel
diff --git a/flyteadmin/pkg/runtime/configuration_provider.go b/flyteadmin/pkg/runtime/configuration_provider.go
 	return p.clusterPoolAssignmentConfiguration
 }

 func (p *ConfigurationProvider) ExternalResourceConfiguration() interfaces.ExternalResourceConfiguration {
 	return p.externalResourceConfiguration
 }

 func NewConfigurationProvider() interfaces.Configuration {
diff --git a/flyteadmin/pkg/runtime/external_resource_provider.go b/flyteadmin/pkg/runtime/external_resource_provider.go
 // ExternalResourcesConfigurationProvider Implementation of an interfaces.ExternalResourceConfiguration
 type ExternalResourcesConfigurationProvider struct{}

 func (e ExternalResourcesConfigurationProvider) GetExternalResource() interfaces.ExternalResource {
 	return externalResourcesConfig.GetConfig().(*interfaces.ExternalResourceConfig).ExternalResource
 }

 func NewExternalResourceConfigurationProvider() interfaces.ExternalResourceConfiguration {
diff --git a/flyteadmin/pkg/workflowengine/impl/prepare_execution.go b/flyteadmin/pkg/workflowengine/impl/prepare_execution.go
 	}

 	if externalResource != nil && externalResource.GetConnections() != nil {
 		connections := make(map[string]v1alpha1.Connection)
 		for name, connection := range externalResource.GetConnections() {
 			connections[name] = v1alpha1.Connection{
 				Secrets: connection.GetSecrets(),
 				Configs: connection.GetConfigs(),
 			}
 		}

 		executionConfig.ExternalResourceAttribute = v1alpha1.ExternalResourceAttributes{
 			Connections: connections,
 		}
 	}
	func (m ExecutionManager) getExternalResourceAttributes(ctx context.Context, request admin.ExecutionCreateRequest) (
	*admin.ExternalResourceAttributes, error) {
	if request.Spec.ExternalResourceAttributes != nil {
	return request.Spec.ExternalResourceAttributes, nil
Check warning on line 427 in flyteadmin/pkg/manager/impl/execution_manager.go Codecov / codecov/patch flyteadmin/pkg/manager/impl/execution_manager.go#L427 `Added line #L427 was not covered by tests`
	}

	resource, err := m.resourceManager.GetResource(ctx, interfaces.ResourceRequest{
	ResourceType: admin.MatchableResource_EXTERNAL_RESOURCE,
	})
	if err != nil && !errors.IsDoesNotExistError(err) {
	logger.Errorf(ctx, "Failed to get external resource with error: %v", err)
	return nil, err
Check warning on line 437 in flyteadmin/pkg/manager/impl/execution_manager.go Codecov / codecov/patch flyteadmin/pkg/manager/impl/execution_manager.go#L436-L437 `Added lines #L436 - L437 were not covered by tests`
	}
	if resource != nil && resource.Attributes.GetExternalResourceAttributes() != nil {
	return resource.Attributes.GetExternalResourceAttributes(), nil
Check warning on line 440 in flyteadmin/pkg/manager/impl/execution_manager.go Codecov / codecov/patch flyteadmin/pkg/manager/impl/execution_manager.go#L440 `Added line #L440 was not covered by tests`
	}

	externalResource := m.config.ExternalResourceConfiguration().GetExternalResource()
	connections := make(map[string]*core.Connection)
	for key, connection := range externalResource.Connections {
	connections[key] = &core.Connection{
	Secrets: connection.Secrets,
	Configs: connection.Configs,
Check warning on line 448 in flyteadmin/pkg/manager/impl/execution_manager.go Codecov / codecov/patch flyteadmin/pkg/manager/impl/execution_manager.go#L446-L448 `Added lines #L446 - L448 were not covered by tests`
	}
	}


	externalResourceAttribute, err := m.getExternalResourceAttributes(ctx, &request)
	if err != nil {
	return nil, nil, err
Check warning on line 987 in flyteadmin/pkg/manager/impl/execution_manager.go Codecov / codecov/patch flyteadmin/pkg/manager/impl/execution_manager.go#L987 `Added line #L987 was not covered by tests`
	}

	var executionClusterLabel *admin.ExecutionClusterLabel
	return p.clusterPoolAssignmentConfiguration
	}

	func (p *ConfigurationProvider) ExternalResourceConfiguration() interfaces.ExternalResourceConfiguration {
	return p.externalResourceConfiguration
Check warning on line 63 in flyteadmin/pkg/runtime/configuration_provider.go Codecov / codecov/patch flyteadmin/pkg/runtime/configuration_provider.go#L62-L63 `Added lines #L62 - L63 were not covered by tests`
	}

	func NewConfigurationProvider() interfaces.Configuration {
	// ExternalResourcesConfigurationProvider Implementation of an interfaces.ExternalResourceConfiguration
	type ExternalResourcesConfigurationProvider struct{}

	func (e ExternalResourcesConfigurationProvider) GetExternalResource() interfaces.ExternalResource {
	return externalResourcesConfig.GetConfig().(*interfaces.ExternalResourceConfig).ExternalResource
Check warning on line 16 in flyteadmin/pkg/runtime/external_resource_provider.go Codecov / codecov/patch flyteadmin/pkg/runtime/external_resource_provider.go#L15-L16 `Added lines #L15 - L16 were not covered by tests`
	}

	func NewExternalResourceConfigurationProvider() interfaces.ExternalResourceConfiguration {
	}

	if externalResource != nil && externalResource.GetConnections() != nil {
	connections := make(map[string]v1alpha1.Connection)
	for name, connection := range externalResource.GetConnections() {
	connections[name] = v1alpha1.Connection{
	Secrets: connection.GetSecrets(),
	Configs: connection.GetConfigs(),
Check warning on line 116 in flyteadmin/pkg/workflowengine/impl/prepare_execution.go Codecov / codecov/patch flyteadmin/pkg/workflowengine/impl/prepare_execution.go#L112-L116 `Added lines #L112 - L116 were not covered by tests`
	}
	}

	executionConfig.ExternalResourceAttribute = v1alpha1.ExternalResourceAttributes{
	Connections: connections,
Check warning on line 121 in flyteadmin/pkg/workflowengine/impl/prepare_execution.go Codecov / codecov/patch flyteadmin/pkg/workflowengine/impl/prepare_execution.go#L120-L121 `Added lines #L120 - L121 were not covered by tests`
	}
	}