Remove actions client (#4405)

Author: nikola-jokic

.mockery.yaml

@@ -9,15 +9,6 @@ pkgname: "{{.SrcPackageName}}"
 recursive: false
 template: testify
 packages:
-  github.com/actions/actions-runner-controller/github/actions:
-    config:
-      inpackage: true
-      dir: "{{.InterfaceDir}}"
-      filename: "mocks_test.go"
-      pkgname: "actions"
-    interfaces:
-      ActionsService:
-      SessionService:
   github.com/actions/actions-runner-controller/cmd/ghalistener/metrics:
     config:
       all: true

apis/actions.github.com/v1alpha1/tls_config_test.go

@@ -1,73 +1,20 @@
 package config_test
 
 import (
-	"context"
-	"crypto/tls"
 	"encoding/json"
 	"log/slog"
-	"net/http"
 	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/actions/actions-runner-controller/apis/actions.github.com/v1alpha1/appconfig"
 	"github.com/actions/actions-runner-controller/cmd/ghalistener/config"
-	"github.com/actions/actions-runner-controller/github/actions/testserver"
 	"github.com/actions/scaleset"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 var discardLogger = slog.New(slog.DiscardHandler)
 
-func TestCustomerServerRootCA(t *testing.T) {
-	ctx := context.Background()
-	certsFolder := filepath.Join(
-		"../../../",
-		"github",
-		"actions",
-		"testdata",
-	)
-	certPath := filepath.Join(certsFolder, "server.crt")
-	keyPath := filepath.Join(certsFolder, "server.key")
-
-	serverCalledSuccessfully := false
-
-	server := testserver.NewUnstarted(t, http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		serverCalledSuccessfully = true
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(`{"count": 0}`))
-	}))
-	cert, err := tls.LoadX509KeyPair(certPath, keyPath)
-	require.NoError(t, err)
-
-	server.TLS = &tls.Config{Certificates: []tls.Certificate{cert}}
-	server.StartTLS()
-
-	var certsString string
-	rootCA, err := os.ReadFile(filepath.Join(certsFolder, "rootCA.crt"))
-	require.NoError(t, err)
-	certsString = string(rootCA)
-
-	intermediate, err := os.ReadFile(filepath.Join(certsFolder, "intermediate.crt"))
-	require.NoError(t, err)
-	certsString = certsString + string(intermediate)
-
-	config := config.Config{
-		ConfigureURL: server.ConfigURLForOrg("myorg"),
-		ServerRootCA: certsString,
-		AppConfig: &appconfig.AppConfig{
-			Token: "token",
-		},
-	}
-
-	client, err := config.ActionsClient(discardLogger)
-	require.NoError(t, err)
-	_, err = client.GetRunnerScaleSet(ctx, 1, "test")
-	require.NoError(t, err)
-	assert.True(t, serverCalledSuccessfully)
-}
-
 func TestProxySettings(t *testing.T) {
 	assertHasProxy := func(t *testing.T, debugInfo string, want bool) {
 		type debugInfoContent struct {

cmd/ghalistener/config/config_client_test.go

@@ -20,13 +20,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net/http"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/actions/actions-runner-controller/apis/actions.github.com/v1alpha1"
-	"github.com/actions/actions-runner-controller/github/actions"
 	"github.com/actions/scaleset"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
@@ -410,12 +408,8 @@ func (r *EphemeralRunnerReconciler) deleteEphemeralRunnerOrPod(ctx context.Conte
 
 func (r *EphemeralRunnerReconciler) cleanupRunnerFromService(ctx context.Context, ephemeralRunner *v1alpha1.EphemeralRunner, log logr.Logger) (ok bool, err error) {
 	if err := r.deleteRunnerFromService(ctx, ephemeralRunner, log); err != nil {
-		actionsError := &actions.ActionsError{}
-		if !errors.As(err, &actionsError) {
-			return false, err
-		}
-
-		if actionsError.StatusCode == http.StatusBadRequest && actionsError.IsException("JobStillRunningException") {
+		if errors.Is(err, scaleset.JobStillRunningError) {
+			log.Info("Runner job is still running, cannot remove the runner from the service yet")
 			return false, nil
 		}
 
@@ -625,16 +619,10 @@ func (r *EphemeralRunnerReconciler) createRunnerJitConfig(ctx context.Context, e
 		return jitConfig, nil
 	}
 
-	actionsError := &actions.ActionsError{}
-	if !errors.As(err, &actionsError) {
+	if !errors.Is(err, scaleset.RunnerExistsError) {
 		return nil, fmt.Errorf("failed to generate JIT config with generic error: %w", err)
 	}
 
-	if actionsError.StatusCode != http.StatusConflict ||
-		!actionsError.IsException("AgentExistsException") {
-		return nil, fmt.Errorf("failed to generate JIT config with Actions service error: %w", err)
-	}
-
 	// If the runner with the name we want already exists it means:
 	// - We might have a name collision.
 	// - Our previous reconciliation loop failed to update the

controllers/actions.github.com/ephemeralrunner_controller.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/actions/actions-runner-controller/apis/actions.github.com/v1alpha1"
-	"github.com/actions/actions-runner-controller/github/actions"
 
 	"github.com/actions/actions-runner-controller/controllers/actions.github.com/multiclient"
 	scalefake "github.com/actions/actions-runner-controller/controllers/actions.github.com/multiclient/fake"
@@ -1113,12 +1112,7 @@ var _ = Describe("EphemeralRunner", func() {
 								scalefake.NewClient(
 									scalefake.WithGetRunner(
 										nil,
-										&actions.ActionsError{
-											StatusCode: http.StatusNotFound,
-											Err: &actions.ActionsExceptionError{
-												ExceptionName: "AgentNotFoundException",
-											},
-										},
+										scaleset.RunnerNotFoundError,
 									),
 									scalefake.WithGenerateJitRunnerConfig(
 										&scaleset.RunnerScaleSetJitRunnerConfig{

controllers/actions.github.com/ephemeralrunner_controller_test.go

@@ -20,14 +20,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net/http"
 	"sort"
 	"strconv"
 
 	"github.com/actions/actions-runner-controller/apis/actions.github.com/v1alpha1"
 	"github.com/actions/actions-runner-controller/controllers/actions.github.com/metrics"
 	"github.com/actions/actions-runner-controller/controllers/actions.github.com/multiclient"
 	"github.com/actions/actions-runner-controller/github/actions"
+	"github.com/actions/scaleset"
 	"github.com/go-logr/logr"
 	"go.uber.org/multierr"
 	corev1 "k8s.io/api/core/v1"
@@ -48,9 +48,8 @@ const (
 // EphemeralRunnerSetReconciler reconciles a EphemeralRunnerSet object
 type EphemeralRunnerSetReconciler struct {
 	client.Client
-	Log           logr.Logger
-	Scheme        *runtime.Scheme
-	ActionsClient actions.MultiClient
+	Log    logr.Logger
+	Scheme *runtime.Scheme
 
 	PublishMetrics bool
 
@@ -484,14 +483,7 @@ func (r *EphemeralRunnerSetReconciler) deleteIdleEphemeralRunners(ctx context.Co
 
 func (r *EphemeralRunnerSetReconciler) deleteEphemeralRunnerWithActionsClient(ctx context.Context, ephemeralRunner *v1alpha1.EphemeralRunner, actionsClient multiclient.Client, log logr.Logger) (bool, error) {
 	if err := actionsClient.RemoveRunner(ctx, int64(ephemeralRunner.Status.RunnerId)); err != nil {
-		actionsError := &actions.ActionsError{}
-		if !errors.As(err, &actionsError) {
-			log.Error(err, "failed to remove runner from the service", "name", ephemeralRunner.Name, "runnerId", ephemeralRunner.Status.RunnerId)
-			return false, err
-		}
-
-		if actionsError.StatusCode == http.StatusBadRequest &&
-			actionsError.IsException("JobStillRunningException") {
+		if errors.Is(err, scaleset.JobStillRunningError) {
 			log.Info("Runner is still running a job, skipping deletion", "name", ephemeralRunner.Name, "runnerId", ephemeralRunner.Status.RunnerId)
 			return false, nil
 		}