Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/ax/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ func dialGuest(targetActor, kubeContext, axNamespace string) (*guest.Client, fun
// 1. Connect directly to ATENET_ROUTER_ADDR when set (e.g. in-cluster).
if routerAddr := os.Getenv("ATENET_ROUTER_ADDR"); routerAddr != "" {
addr := strings.TrimPrefix(strings.TrimPrefix(routerAddr, "http://"), "https://")
client, err := guest.DialTarget(addr, targetActor)
client, err := guest.Dial(addr, targetActor)
if err != nil {
return nil, nil, fmt.Errorf("connecting to guest via atenet-router at %s: %w", addr, err)
}
Expand All @@ -1197,7 +1197,7 @@ func dialGuest(targetActor, kubeContext, axNamespace string) (*guest.Client, fun
return nil, nil, fmt.Errorf("establishing port-forward to atenet-router: %w (%v)", err, setupErr)
}
routerEndpoint := fmt.Sprintf("127.0.0.1:%d", localPort)
client, err = guest.DialTarget(routerEndpoint, targetActor)
client, err = guest.Dial(routerEndpoint, targetActor)
if err != nil {
cleanup()
return nil, nil, fmt.Errorf("connecting to guest via atenet-router at %s: %w", routerEndpoint, err)
Expand All @@ -1215,7 +1215,7 @@ func dialRouterTLS(targetActor, kubeContext, axNamespace string) (client *guest.
return nil, nil, fmt.Errorf("port 443 forward error: %w", err), nil
}
routerEndpoint := fmt.Sprintf("127.0.0.1:%d", localPort)
client, err = guest.DialTargetTLS(routerEndpoint, targetActor, tlsCfg)
client, err = guest.DialTLS(routerEndpoint, targetActor, tlsCfg)
if err != nil {
cleanup()
return nil, nil, nil, fmt.Errorf("connecting to guest via atenet-router at %s: %w", routerEndpoint, err)
Expand Down
41 changes: 20 additions & 21 deletions internal/controller/reconciler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import (
ateapipb "go.ate.dev/substrate/api/ateapi/v1"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"
)
Expand Down Expand Up @@ -272,7 +271,7 @@ func TestTaskReconciler(t *testing.T) {
defer grpcServer.Stop()

// 2. Initialize Substrate client
client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -344,7 +343,7 @@ func TestTaskReconciler_MissingImage(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -385,7 +384,7 @@ func TestTaskReconciler_RunnerVolumeImage(t *testing.T) {
ateapipb.RegisterControlServer(grpcServer, mockSrv)
go grpcServer.Serve(lis)
t.Cleanup(grpcServer.Stop)
client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -456,7 +455,7 @@ func TestTaskReconciler_Suspend(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -509,7 +508,7 @@ func TestTaskReconciler_GatewayRules(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -576,7 +575,7 @@ func TestTaskReconciler_SuspendError(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -630,7 +629,7 @@ func TestTaskReconciler_TemplateCreationFailed(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -704,7 +703,7 @@ func TestTaskReconciler_TemplateCreationTransient(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -767,7 +766,7 @@ func TestTaskReconciler_WorkspaceReady(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -872,7 +871,7 @@ func TestTaskReconciler_ResumeTaskPush(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -999,7 +998,7 @@ func TestTaskReconciler_ResumeCommandCannotStart(t *testing.T) {
ateapipb.RegisterControlServer(grpcServer, &mockControlServer{})
go grpcServer.Serve(lis)
t.Cleanup(grpcServer.Stop)
client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -1083,7 +1082,7 @@ func TestTaskReconciler_ResourceLimits(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -1184,7 +1183,7 @@ func TestTaskReconciler_ResourceLimitsFailurePaths(t *testing.T) {
grpcServer := grpc.NewServer()
ateapipb.RegisterControlServer(grpcServer, mockSrv)
go grpcServer.Serve(lis)
client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -1294,7 +1293,7 @@ func TestDelete_RemovesActorAndTemplates(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -1356,7 +1355,7 @@ func TestDelete_BlocksUntilActorDeleted(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -1397,7 +1396,7 @@ func TestDelete_ActorDeletionTimeout(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -1427,7 +1426,7 @@ func TestEnsureActor_RevertsCrashedActor(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -1460,7 +1459,7 @@ func TestTaskReconciler_TransientSubstrateUnavailable(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -1542,7 +1541,7 @@ func TestTaskReconciler_ATETemplate(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down Expand Up @@ -1608,7 +1607,7 @@ func TestTaskReconciler_WorkspaceProfilePrecedence(t *testing.T) {
go grpcServer.Serve(lis)
defer grpcServer.Stop()

client, err := substrate.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := substrate.NewClientWithOptions(substrate.ClientOptions{Target: lis.Addr().String(), Plaintext: true})
if err != nil {
t.Fatalf("failed to create substrate client: %v", err)
}
Expand Down
15 changes: 5 additions & 10 deletions internal/guest/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,16 @@ type Client struct {
filesystem ateenvv1alpha.FileSystemServiceClient
}

// Dial connects to the guest daemon at the specified target (e.g., "127.0.0.1:80").
func Dial(target string) (*Client, error) {
return DialTarget(target, "")
}

// DialTarget connects to the guest daemon at the specified target, optionally injecting
// Dial connects to the guest daemon at the specified target, optionally injecting
// the 'ate-target-actor' metadata header on all calls (required when routing via atenet-router).
func DialTarget(target string, targetActor string) (*Client, error) {
return DialTargetTLS(target, targetActor, nil)
func Dial(target string, targetActor string) (*Client, error) {
return DialTLS(target, targetActor, nil)
}

// DialTargetTLS connects to the guest daemon at the specified target using TLS when
// DialTLS connects to the guest daemon at the specified target using TLS when
// tlsConfig is non-nil (or plaintext otherwise), optionally injecting the
// 'ate-target-actor' metadata header on all calls.
func DialTargetTLS(target string, targetActor string, tlsConfig *tls.Config) (*Client, error) {
func DialTLS(target string, targetActor string, tlsConfig *tls.Config) (*Client, error) {
target = strings.TrimPrefix(target, "http://")
target = strings.TrimPrefix(target, "https://")

Expand Down
2 changes: 1 addition & 1 deletion internal/guest/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func startGuest(t *testing.T) *guest.Client {
cleanup()
})

client, err := guest.Dial(lis.Addr().String())
client, err := guest.Dial(lis.Addr().String(), "")
if err != nil {
t.Fatalf("dialing guest: %v", err)
}
Expand Down
15 changes: 1 addition & 14 deletions internal/metadata/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ type ServerOptions struct {
// NewServer creates a new metadata and guest server serving the task and its
// bound workspace, which may be nil. port is the probe and guest port; the
// metadata endpoints use ServerOptions.MetadataPort on loopback. A zero port
// picks a free one; read the result from ProbeAddr or MetadataURL after Start.
// picks a free one.
func NewServer(port int, task *v1alpha1.Task, ws *v1alpha1.Workspace, opts ...ServerOptions) *Server {
var opt ServerOptions
if len(opts) > 0 {
Expand Down Expand Up @@ -185,12 +185,6 @@ func NewServer(port int, task *v1alpha1.Task, ws *v1alpha1.Workspace, opts ...Se
return s
}

// ProbeAddr is the address the probe and guest listener is bound to. It is
// empty until Start succeeds.
func (s *Server) ProbeAddr() string {
return s.probeAddr

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, so we only exposed it because we had the test in a different package 👀

}

// MetadataURL is the base URL of the metadata endpoints, as handed to the task
// command in AX_METADATA_URL. It is empty until Start succeeds.
func (s *Server) MetadataURL() string {
Expand Down Expand Up @@ -319,13 +313,6 @@ func (s *Server) Pushes() <-chan Push {
return s.pushes
}

// IsWorkspaceReady returns whether the workspace setup has completed.
func (s *Server) IsWorkspaceReady() bool {
s.mu.RLock()
defer s.mu.RUnlock()
return s.workspaceReady
}

func (s *Server) handleHealthz(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
_, _ = w.Write([]byte("ok\n"))
Expand Down
Loading
Loading