mirror of
https://github.com/agent-substrate/substrate.git
synced 2026-11-11 10:23:17 +08:00
Follow up on issue #1168 and the base PR #1215 In this PR: **Actor read/lifecycle verbs — completes Actor end-to-end** * `Get`/`Delete`/`Suspend`/`Pause`/`Resume` `ActorRequest`: dropped the `+k8s:opaqueType` fence on the actor ref, added `+k8s:required` + `+k8s:subfield(atespace)=+k8s:required`. Combined with the recursion into `Validate_ObjectRef` this reproduces exactly what `resources.ValidateObjectRef` enforced (ref required, atespace required, name required, both DNS-1123 labels). * `ListActorsRequest`: tagged to match `ListAtespacesRequest` (atespace optional + short-name format, `page_size` minimum 1, `page_token` max length 256). * All six `validate*Request()` functions are now one-line calls to the generated validators. With this, every RPC verb on `Actor` and `Atespace` is fully declarative; `resources.ValidateObjectRef` has no callers left in `actor.go`. **Note:**`ListActorsRequest.page_token` now capped at 256 chars (parity with `ListAtespaces`). **Testing** * Existing verb tests updated to the generated error shapes (`field.ErrorMatcher` with origin matching). * New coverage: `page_token` boundary cases for `ListActors`; * `controlapi`, `functionaltest`, `actoridentity`, `store`, and `atepg` suites all pass; `go vet` and `gofmt` clean. - [ ] Tests pass - [ ] Appropriate changes to documentation are included in the PR --------- Co-authored-by: Michelle Au <msau42@users.noreply.github.com>
150 lines
5.4 KiB
Go
150 lines
5.4 KiB
Go
// Copyright 2026 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package controlapi
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/agent-substrate/substrate/cmd/ateapi/internal/store"
|
|
"github.com/agent-substrate/substrate/pkg/proto/ateapipb"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
"k8s.io/apimachinery/pkg/api/operation"
|
|
"k8s.io/apimachinery/pkg/util/validation/field"
|
|
)
|
|
|
|
func (s *RPCService) CreateAtespace(ctx context.Context, req *ateapipb.CreateAtespaceRequest) (*ateapipb.Atespace, error) {
|
|
inAtespace := req.GetAtespace()
|
|
if inAtespace != nil { // otherwise validation will flag it
|
|
scrubResourceMetadataForCreate(inAtespace.Metadata)
|
|
// no status field, but if there were, we would scrub it here
|
|
}
|
|
|
|
// Validate the request, including the object within it.
|
|
if errs := validateCreateAtespaceRequest(ctx, req); len(errs) > 0 {
|
|
return nil, toGRPCStatusError(errs)
|
|
}
|
|
|
|
// Handle the creation, including validation of the final stored object.
|
|
return s.impl.CreateAtespace(ctx, inAtespace)
|
|
}
|
|
|
|
func (s *ServiceImpl) CreateAtespace(ctx context.Context, inAtespace *ateapipb.Atespace) (*ateapipb.Atespace, error) {
|
|
// no further processing or status, but if there were, we would do it here
|
|
|
|
// Save the data in the storage layer.
|
|
stored, err := s.store.CreateAtespace(ctx, inAtespace)
|
|
if err != nil {
|
|
if errors.Is(err, store.ErrAlreadyExists) {
|
|
return nil, status.Errorf(codes.AlreadyExists, "Atespace %s already exists", inAtespace.Metadata.Name)
|
|
}
|
|
return nil, fmt.Errorf("while recording atespace: %w", err)
|
|
}
|
|
|
|
return stored, nil
|
|
}
|
|
|
|
func validateCreateAtespaceRequest(ctx context.Context, req *ateapipb.CreateAtespaceRequest) field.ErrorList {
|
|
// Call the generated validation.
|
|
op := operation.Operation{Type: operation.Create}
|
|
return Validate_CreateAtespaceRequest(ctx, op, nil, req, nil)
|
|
}
|
|
|
|
func (s *RPCService) GetAtespace(ctx context.Context, req *ateapipb.GetAtespaceRequest) (*ateapipb.Atespace, error) {
|
|
if errs := validateGetAtespaceRequest(ctx, req); len(errs) > 0 {
|
|
return nil, toGRPCStatusError(errs)
|
|
}
|
|
|
|
return s.impl.GetAtespace(ctx, req.Atespace.Name)
|
|
}
|
|
|
|
func (s *ServiceImpl) GetAtespace(ctx context.Context, name string) (*ateapipb.Atespace, error) {
|
|
atespace, err := s.store.GetAtespace(ctx, name)
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
return nil, status.Errorf(codes.NotFound, "Atespace %s not found", name)
|
|
} else if err != nil {
|
|
return nil, fmt.Errorf("while getting atespace from DB: %w", err)
|
|
}
|
|
|
|
return atespace, nil
|
|
}
|
|
|
|
func validateGetAtespaceRequest(ctx context.Context, req *ateapipb.GetAtespaceRequest) field.ErrorList {
|
|
// Call the generated validation.
|
|
op := operation.Operation{Type: operation.Create}
|
|
return Validate_GetAtespaceRequest(ctx, op, nil, req, nil)
|
|
}
|
|
|
|
func (s *RPCService) ListAtespaces(ctx context.Context, req *ateapipb.ListAtespacesRequest) (*ateapipb.ListAtespacesResponse, error) {
|
|
if errs := validateListAtespacesRequest(ctx, req); len(errs) > 0 {
|
|
return nil, toGRPCStatusError(errs)
|
|
}
|
|
|
|
page, err := s.impl.ListAtespaces(ctx, store.ListOptions{PageSize: req.PageSize, PageToken: req.PageToken})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &ateapipb.ListAtespacesResponse{
|
|
Atespaces: page.Items,
|
|
NextPageToken: page.NextPageToken,
|
|
}, nil
|
|
}
|
|
|
|
func (s *ServiceImpl) ListAtespaces(ctx context.Context, opts store.ListOptions) (store.ListResponse[*ateapipb.Atespace], error) {
|
|
opts.PageSize = effectivePageSize(opts.PageSize)
|
|
page, err := s.store.ListAtespaces(ctx, opts)
|
|
if err != nil {
|
|
return page, mapListError(fmt.Errorf("while listing atespaces in db: %w", err))
|
|
}
|
|
return page, nil
|
|
}
|
|
|
|
func validateListAtespacesRequest(ctx context.Context, req *ateapipb.ListAtespacesRequest) field.ErrorList {
|
|
// Call the generated validation.
|
|
op := operation.Operation{Type: operation.Create}
|
|
return Validate_ListAtespacesRequest(ctx, op, nil, req, nil)
|
|
}
|
|
|
|
func (s *RPCService) DeleteAtespace(ctx context.Context, req *ateapipb.DeleteAtespaceRequest) (*ateapipb.Atespace, error) {
|
|
if errs := validateDeleteAtespaceRequest(ctx, req); len(errs) > 0 {
|
|
return nil, toGRPCStatusError(errs)
|
|
}
|
|
|
|
return s.impl.DeleteAtespace(ctx, req.Atespace.Name)
|
|
}
|
|
|
|
func (s *ServiceImpl) DeleteAtespace(ctx context.Context, name string) (*ateapipb.Atespace, error) {
|
|
deleted, err := s.store.DeleteAtespace(ctx, name)
|
|
if err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
return nil, status.Errorf(codes.NotFound, "Atespace %s not found", name)
|
|
}
|
|
if errors.Is(err, store.ErrFailedPrecondition) {
|
|
return nil, status.Errorf(codes.FailedPrecondition, "Atespace %s is not empty", name)
|
|
}
|
|
return nil, fmt.Errorf("while deleting atespace from DB: %w", err)
|
|
}
|
|
|
|
return deleted, nil
|
|
}
|
|
|
|
func validateDeleteAtespaceRequest(ctx context.Context, req *ateapipb.DeleteAtespaceRequest) field.ErrorList {
|
|
// Call the generated validation.
|
|
op := operation.Operation{Type: operation.Create}
|
|
return Validate_DeleteAtespaceRequest(ctx, op, nil, req, nil)
|
|
}
|