Merge branch 'remove-error-from-executor-prodiver' into 'master'

Update ExecutorProvider interface signature

See merge request gitlab-org/gitlab-runner!1159

commands/multi.go

@@ -216,21 +216,14 @@ func (mr *RunCommand) acquireRunnerResources(provider common.ExecutorProvider, r
 		return nil, func() {}, fmt.Errorf("failed to update executor: %v", err)
 	}
 
-	releaseProviderFn := func() {
-		err := provider.Release(runner, executorData)
-		if err != nil {
-			logrus.WithError(err).Error("Failed to release executor")
-		}
-	}
-
 	if !mr.buildsHelper.acquireBuild(runner) {
-		releaseProviderFn()
+		provider.Release(runner, executorData)
 		return nil, nil, errors.New("failed to request job, runner limit met")
 	}
 
 	releaseFn := func() {
 		mr.buildsHelper.releaseBuild(runner)
-		releaseProviderFn()
+		provider.Release(runner, executorData)
 	}
 
 	return executorData, releaseFn, nil

common/executor.go

@@ -48,7 +48,7 @@ type ExecutorProvider interface {
 	CanCreate() bool
 	Create() Executor
 	Acquire(config *RunnerConfig) (ExecutorData, error)
-	Release(config *RunnerConfig, data ExecutorData) error
+	Release(config *RunnerConfig, data ExecutorData)
 	GetFeatures(features *FeaturesInfo) error
 	GetDefaultShell() string
 }

common/mock_ExecutorProvider.go

@@ -93,15 +93,6 @@ func (_m *MockExecutorProvider) GetFeatures(features *FeaturesInfo) error {
 }
 
 // Release provides a mock function with given fields: config, data
-func (_m *MockExecutorProvider) Release(config *RunnerConfig, data ExecutorData) error {
-	ret := _m.Called(config, data)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(*RunnerConfig, ExecutorData) error); ok {
-		r0 = rf(config, data)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
+func (_m *MockExecutorProvider) Release(config *RunnerConfig, data ExecutorData) {
+	_m.Called(config, data)
 }

executors/default_executor_provider.go

@@ -27,9 +27,7 @@ func (e DefaultExecutorProvider) Acquire(config *common.RunnerConfig) (common.Ex
 	return nil, nil
 }
 
-func (e DefaultExecutorProvider) Release(config *common.RunnerConfig, data common.ExecutorData) error {
-	return nil
-}
+func (e DefaultExecutorProvider) Release(config *common.RunnerConfig, data common.ExecutorData) {}
 
 func (e DefaultExecutorProvider) GetFeatures(features *common.FeaturesInfo) error {
 	if e.FeaturesUpdater == nil {

executors/docker/machine/provider.go

@@ -379,7 +379,7 @@ func (m *machineProvider) Use(config *common.RunnerConfig, data common.ExecutorD
 	return
 }
 
-func (m *machineProvider) Release(config *common.RunnerConfig, data common.ExecutorData) error {
+func (m *machineProvider) Release(config *common.RunnerConfig, data common.ExecutorData) {
 	// Release machine
 	details, ok := data.(*machineDetails)
 	if ok {
@@ -393,12 +393,11 @@ func (m *machineProvider) Release(config *common.RunnerConfig, data common.Execu
 			config.Machine.MaxBuilds > 0 && details.UsedCount >= config.Machine.MaxBuilds {
 			err := m.remove(details.Name, "Too many builds")
 			if err == nil {
-				return nil
+				return
 			}
 		}
 		details.State = machineStateIdle
 	}
-	return nil
 }
 
 func (m *machineProvider) CanCreate() bool {

executors/docker/machine/provider_test.go

@@ -564,8 +564,7 @@ func TestMachineReleaseIfInvalidDataArePassed(t *testing.T) {
 	assert.NotNil(t, nd)
 	assertTotalMachines(t, p, 1, "it creates one machine")
 
-	err = p.Release(nil, nd)
-	assert.NoError(t, err, "it should not fail")
+	p.Release(nil, nd)
 }
 
 func TestMachineCreationIfFailedToConnect(t *testing.T) {