From db5f3b82453e98ec9a8e8278866aeb75aa176ab2 Mon Sep 17 00:00:00 2001 From: Troy Chiu Date: Fri, 5 Jun 2026 06:18:27 +0000 Subject: [PATCH] add goimports to .golangci.yaml and fix lint errors --- .golangci.yaml | 7 +++++++ .../internal/controlapi/create_actor.go | 7 ++++--- .../internal/controlapi/delete_actor.go | 5 +++-- .../internal/controlapi/functional_test.go | 17 +++++++++-------- cmd/ateapi/internal/controlapi/get_actor.go | 5 +++-- cmd/ateapi/internal/controlapi/list_actors.go | 3 ++- .../internal/controlapi/resume_actor.go | 5 +++-- cmd/ateapi/internal/controlapi/service.go | 1 - .../internal/controlapi/suspend_actor.go | 5 +++-- cmd/ateapi/internal/controlapi/syncer.go | 5 +++-- cmd/ateapi/internal/controlapi/syncer_test.go | 7 ++++--- cmd/ateapi/internal/controlapi/workflow.go | 7 ++++--- .../internal/controlapi/workflow_resume.go | 7 ++++--- .../internal/controlapi/workflow_suspend.go | 3 ++- .../sessionidentity/sessionidentity.go | 11 ++++++----- .../internal/store/ateredis/ateredis.go | 5 +++-- .../internal/store/storetest/storetest.go | 5 +++-- cmd/ateapi/main.go | 19 ++++++++++--------- cmd/atecontroller/main.go | 11 ++++++----- cmd/atelet/main.go | 17 +++++++++-------- cmd/atelet/oci.go | 5 +++-- cmd/atenet/internal/app/dns/cmd.go | 3 ++- cmd/atenet/internal/app/root.go | 3 ++- cmd/atenet/internal/app/router/atstore.go | 3 ++- .../internal/app/router/atstore_file.go | 3 ++- cmd/atenet/internal/app/router/extproc_in.go | 3 ++- .../internal/app/router/extproc_test.go | 3 ++- cmd/atenet/internal/app/router/health.go | 3 ++- cmd/atenet/internal/app/router/resumer.go | 3 ++- .../internal/app/router/resumer_test.go | 3 ++- cmd/ateom-gvisor/main.go | 15 ++++++++------- .../internal/cmd/admin_debug_redis_flush.go | 3 ++- .../internal/cmd/admin_make_ca_pool.go | 5 +++-- .../internal/cmd/admin_make_jwt_pool.go | 5 +++-- cmd/kubectl-ate/internal/cmd/create_actor.go | 3 ++- cmd/kubectl-ate/internal/cmd/delete_actor.go | 3 ++- cmd/kubectl-ate/internal/cmd/get_actors.go | 3 ++- cmd/kubectl-ate/internal/cmd/get_workers.go | 3 ++- cmd/kubectl-ate/internal/cmd/logs_actors.go | 5 +++-- .../internal/cmd/logs_actors_test.go | 3 ++- cmd/kubectl-ate/internal/cmd/resume_actor.go | 3 ++- cmd/kubectl-ate/internal/cmd/suspend_actor.go | 3 ++- cmd/kubectl-ate/internal/printer/printer.go | 3 ++- .../internal/printer/printer_test.go | 3 ++- cmd/podcertcontroller/main.go | 13 +++++++------ demos/agent-secret/main.go | 3 ++- demos/claude-code-multiplex/ui/server.go | 3 ++- demos/sandbox/client/main.go | 3 ++- internal/ateclient/builder.go | 4 ++-- .../controllers/actortemplate_controller.go | 5 +++-- internal/dns/dns.go | 3 ++- internal/e2e/clients.go | 5 +++-- internal/e2e/suites/demo/demo_test.go | 5 +++-- .../podidentitysigner/podidentitysigner.go | 7 ++++--- internal/serverboot/serverboot.go | 3 ++- internal/servicednssigner/servicednssigner.go | 7 ++++--- internal/signercontroller/signercontroller.go | 3 ++- 57 files changed, 184 insertions(+), 124 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index ab63bf4ee..20eda8bf5 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -107,6 +107,13 @@ linters: linters: [staticcheck] text: '^ST1019' +formatters: + enable: + - goimports + settings: + goimports: + local-prefixes: github.com/agent-substrate/substrate + issues: max-issues-per-linter: 0 max-same-issues: 0 diff --git a/cmd/ateapi/internal/controlapi/create_actor.go b/cmd/ateapi/internal/controlapi/create_actor.go index 055411a41..cba42dcaa 100644 --- a/cmd/ateapi/internal/controlapi/create_actor.go +++ b/cmd/ateapi/internal/controlapi/create_actor.go @@ -19,12 +19,13 @@ import ( "errors" "fmt" - "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" - "github.com/agent-substrate/substrate/internal/resources" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" k8serrors "k8s.io/apimachinery/pkg/api/errors" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" + "github.com/agent-substrate/substrate/internal/resources" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) func (s *Service) CreateActor(ctx context.Context, req *ateapipb.CreateActorRequest) (*ateapipb.CreateActorResponse, error) { diff --git a/cmd/ateapi/internal/controlapi/delete_actor.go b/cmd/ateapi/internal/controlapi/delete_actor.go index db70a32f3..0182426e5 100644 --- a/cmd/ateapi/internal/controlapi/delete_actor.go +++ b/cmd/ateapi/internal/controlapi/delete_actor.go @@ -19,11 +19,12 @@ import ( "errors" "fmt" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" "github.com/agent-substrate/substrate/internal/resources" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) func (s *Service) DeleteActor(ctx context.Context, req *ateapipb.DeleteActorRequest) (*ateapipb.DeleteActorResponse, error) { diff --git a/cmd/ateapi/internal/controlapi/functional_test.go b/cmd/ateapi/internal/controlapi/functional_test.go index 47be1e5b4..29ddb646f 100644 --- a/cmd/ateapi/internal/controlapi/functional_test.go +++ b/cmd/ateapi/internal/controlapi/functional_test.go @@ -25,14 +25,6 @@ import ( "testing" "time" - "github.com/agent-substrate/substrate/cmd/ateapi/internal/store/ateredis" - "github.com/agent-substrate/substrate/internal/ateinterceptors" - "github.com/agent-substrate/substrate/internal/proto/ateletpb" - atev1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" - "github.com/agent-substrate/substrate/pkg/client/clientset/versioned" - "github.com/agent-substrate/substrate/pkg/client/informers/externalversions" - listersv1alpha1 "github.com/agent-substrate/substrate/pkg/client/listers/api/v1alpha1" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "github.com/alicebob/miniredis/v2" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" @@ -48,6 +40,15 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store/ateredis" + "github.com/agent-substrate/substrate/internal/ateinterceptors" + "github.com/agent-substrate/substrate/internal/proto/ateletpb" + atev1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" + "github.com/agent-substrate/substrate/pkg/client/clientset/versioned" + "github.com/agent-substrate/substrate/pkg/client/informers/externalversions" + listersv1alpha1 "github.com/agent-substrate/substrate/pkg/client/listers/api/v1alpha1" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) var ( diff --git a/cmd/ateapi/internal/controlapi/get_actor.go b/cmd/ateapi/internal/controlapi/get_actor.go index d2b5cc637..e319dbbb0 100644 --- a/cmd/ateapi/internal/controlapi/get_actor.go +++ b/cmd/ateapi/internal/controlapi/get_actor.go @@ -19,10 +19,11 @@ import ( "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" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) func (s *Service) GetActor(ctx context.Context, req *ateapipb.GetActorRequest) (*ateapipb.GetActorResponse, error) { diff --git a/cmd/ateapi/internal/controlapi/list_actors.go b/cmd/ateapi/internal/controlapi/list_actors.go index 7f863990c..14426858a 100644 --- a/cmd/ateapi/internal/controlapi/list_actors.go +++ b/cmd/ateapi/internal/controlapi/list_actors.go @@ -18,9 +18,10 @@ import ( "context" "fmt" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) const maxPageSize = 1000 diff --git a/cmd/ateapi/internal/controlapi/resume_actor.go b/cmd/ateapi/internal/controlapi/resume_actor.go index 671afb6ed..5ccfd49cc 100644 --- a/cmd/ateapi/internal/controlapi/resume_actor.go +++ b/cmd/ateapi/internal/controlapi/resume_actor.go @@ -18,10 +18,11 @@ import ( "context" "errors" - "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" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) func (s *Service) ResumeActor(ctx context.Context, req *ateapipb.ResumeActorRequest) (*ateapipb.ResumeActorResponse, error) { diff --git a/cmd/ateapi/internal/controlapi/service.go b/cmd/ateapi/internal/controlapi/service.go index 889d005fb..5502f7b31 100644 --- a/cmd/ateapi/internal/controlapi/service.go +++ b/cmd/ateapi/internal/controlapi/service.go @@ -17,7 +17,6 @@ package controlapi import ( "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" listersv1alpha1 "github.com/agent-substrate/substrate/pkg/client/listers/api/v1alpha1" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) diff --git a/cmd/ateapi/internal/controlapi/suspend_actor.go b/cmd/ateapi/internal/controlapi/suspend_actor.go index c8a88b505..4943d9027 100644 --- a/cmd/ateapi/internal/controlapi/suspend_actor.go +++ b/cmd/ateapi/internal/controlapi/suspend_actor.go @@ -18,10 +18,11 @@ import ( "context" "errors" - "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" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) func (s *Service) SuspendActor(ctx context.Context, req *ateapipb.SuspendActorRequest) (*ateapipb.SuspendActorResponse, error) { diff --git a/cmd/ateapi/internal/controlapi/syncer.go b/cmd/ateapi/internal/controlapi/syncer.go index d693d347c..c3067669c 100644 --- a/cmd/ateapi/internal/controlapi/syncer.go +++ b/cmd/ateapi/internal/controlapi/syncer.go @@ -19,10 +19,11 @@ import ( "errors" "log/slog" - "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) // WorkerPoolSyncer reconciles the state of worker pods from Kubernetes Informer diff --git a/cmd/ateapi/internal/controlapi/syncer_test.go b/cmd/ateapi/internal/controlapi/syncer_test.go index 6ac7ed0ee..1a5365abf 100644 --- a/cmd/ateapi/internal/controlapi/syncer_test.go +++ b/cmd/ateapi/internal/controlapi/syncer_test.go @@ -21,13 +21,14 @@ import ( "testing" "time" - "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" - "github.com/agent-substrate/substrate/cmd/ateapi/internal/store/storetest" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes/fake" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store/storetest" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) // setupSyncerTest sets up a real store with fake Redis and a fake K8s client with informer. diff --git a/cmd/ateapi/internal/controlapi/workflow.go b/cmd/ateapi/internal/controlapi/workflow.go index 6b0fb7611..524948cda 100644 --- a/cmd/ateapi/internal/controlapi/workflow.go +++ b/cmd/ateapi/internal/controlapi/workflow.go @@ -20,15 +20,16 @@ import ( "fmt" "time" - "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" - listersv1alpha1 "github.com/agent-substrate/substrate/pkg/client/listers/api/v1alpha1" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "github.com/google/uuid" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" grpcCodes "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/util/wait" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" + listersv1alpha1 "github.com/agent-substrate/substrate/pkg/client/listers/api/v1alpha1" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) // WorkflowStep represents a single, idempotent operation in a workflow graph. diff --git a/cmd/ateapi/internal/controlapi/workflow_resume.go b/cmd/ateapi/internal/controlapi/workflow_resume.go index 3999cf55d..c18743639 100644 --- a/cmd/ateapi/internal/controlapi/workflow_resume.go +++ b/cmd/ateapi/internal/controlapi/workflow_resume.go @@ -22,14 +22,15 @@ import ( "math/rand" "time" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "k8s.io/apimachinery/pkg/util/wait" + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" "github.com/agent-substrate/substrate/internal/proto/ateletpb" atev1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" listersv1alpha1 "github.com/agent-substrate/substrate/pkg/client/listers/api/v1alpha1" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - "k8s.io/apimachinery/pkg/util/wait" ) // ResumeInput holds the immutable parameters requested by the client. diff --git a/cmd/ateapi/internal/controlapi/workflow_suspend.go b/cmd/ateapi/internal/controlapi/workflow_suspend.go index dd926eb22..f9f0c5d3f 100644 --- a/cmd/ateapi/internal/controlapi/workflow_suspend.go +++ b/cmd/ateapi/internal/controlapi/workflow_suspend.go @@ -23,12 +23,13 @@ import ( "strings" "time" + "k8s.io/apimachinery/pkg/util/wait" + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" "github.com/agent-substrate/substrate/internal/proto/ateletpb" atev1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" listersv1alpha1 "github.com/agent-substrate/substrate/pkg/client/listers/api/v1alpha1" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "k8s.io/apimachinery/pkg/util/wait" ) // SuspendInput holds the immutable parameters requested by the client. diff --git a/cmd/ateapi/internal/sessionidentity/sessionidentity.go b/cmd/ateapi/internal/sessionidentity/sessionidentity.go index 71fa2a6bc..e2eb3ba51 100644 --- a/cmd/ateapi/internal/sessionidentity/sessionidentity.go +++ b/cmd/ateapi/internal/sessionidentity/sessionidentity.go @@ -27,16 +27,17 @@ import ( "strings" "time" - "github.com/agent-substrate/substrate/internal/k8sjwt" - "github.com/agent-substrate/substrate/internal/localca" - "github.com/agent-substrate/substrate/internal/localjwtauthority" - "github.com/agent-substrate/substrate/internal/sessionidjwt" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" "google.golang.org/grpc/metadata" "google.golang.org/grpc/peer" "google.golang.org/grpc/status" + + "github.com/agent-substrate/substrate/internal/k8sjwt" + "github.com/agent-substrate/substrate/internal/localca" + "github.com/agent-substrate/substrate/internal/localjwtauthority" + "github.com/agent-substrate/substrate/internal/sessionidjwt" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) // Server implements ateapipb.SessionIdentityServer diff --git a/cmd/ateapi/internal/store/ateredis/ateredis.go b/cmd/ateapi/internal/store/ateredis/ateredis.go index 206395c97..f06c8e146 100644 --- a/cmd/ateapi/internal/store/ateredis/ateredis.go +++ b/cmd/ateapi/internal/store/ateredis/ateredis.go @@ -52,11 +52,12 @@ import ( "sync" "time" - "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "github.com/redis/go-redis/v9" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) type redisClient interface { diff --git a/cmd/ateapi/internal/store/storetest/storetest.go b/cmd/ateapi/internal/store/storetest/storetest.go index e7f46111d..7f728e809 100644 --- a/cmd/ateapi/internal/store/storetest/storetest.go +++ b/cmd/ateapi/internal/store/storetest/storetest.go @@ -17,10 +17,11 @@ package storetest import ( "testing" - "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" - "github.com/agent-substrate/substrate/cmd/ateapi/internal/store/ateredis" "github.com/alicebob/miniredis/v2" "github.com/redis/go-redis/v9" + + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store" + "github.com/agent-substrate/substrate/cmd/ateapi/internal/store/ateredis" ) // SetupTestStore starts a miniredis server and returns a real store implementation diff --git a/cmd/ateapi/main.go b/cmd/ateapi/main.go index 05eae0ef3..ecb2e7cde 100644 --- a/cmd/ateapi/main.go +++ b/cmd/ateapi/main.go @@ -25,6 +25,16 @@ import ( "os" "time" + "github.com/redis/go-redis/v9" + "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" + sdktrace "go.opentelemetry.io/otel/sdk/trace" + "golang.org/x/oauth2/google" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials" + "google.golang.org/grpc/reflection" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" + "github.com/agent-substrate/substrate/cmd/ateapi/internal/controlapi" "github.com/agent-substrate/substrate/cmd/ateapi/internal/sessionidentity" "github.com/agent-substrate/substrate/cmd/ateapi/internal/store/ateredis" @@ -35,15 +45,6 @@ import ( "github.com/agent-substrate/substrate/pkg/client/clientset/versioned" "github.com/agent-substrate/substrate/pkg/client/informers/externalversions" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "github.com/redis/go-redis/v9" - "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" - sdktrace "go.opentelemetry.io/otel/sdk/trace" - "golang.org/x/oauth2/google" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials" - "google.golang.org/grpc/reflection" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" ) var ( diff --git a/cmd/atecontroller/main.go b/cmd/atecontroller/main.go index 61a591032..2652a0856 100644 --- a/cmd/atecontroller/main.go +++ b/cmd/atecontroller/main.go @@ -18,20 +18,21 @@ import ( "flag" "os" - "github.com/agent-substrate/substrate/internal/controllers" - clientv1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) + _ "k8s.io/client-go/plugin/pkg/client/auth" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) - _ "k8s.io/client-go/plugin/pkg/client/auth" + "github.com/agent-substrate/substrate/internal/controllers" + clientv1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) var ( diff --git a/cmd/atelet/main.go b/cmd/atelet/main.go index a54759af2..af2223f3f 100644 --- a/cmd/atelet/main.go +++ b/cmd/atelet/main.go @@ -31,14 +31,6 @@ import ( "strings" "cloud.google.com/go/storage" - "github.com/agent-substrate/substrate/cmd/atelet/internal/ategcs" - "github.com/agent-substrate/substrate/internal/ateinterceptors" - "github.com/agent-substrate/substrate/internal/ateompath" - "github.com/agent-substrate/substrate/internal/memorypullcache" - "github.com/agent-substrate/substrate/internal/proto/ateletpb" - "github.com/agent-substrate/substrate/internal/proto/ateompb" - "github.com/agent-substrate/substrate/internal/serverboot" - "github.com/agent-substrate/substrate/internal/version" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/google/go-containerregistry/pkg/authn" @@ -51,6 +43,15 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/reflection" "k8s.io/utils/lru" + + "github.com/agent-substrate/substrate/cmd/atelet/internal/ategcs" + "github.com/agent-substrate/substrate/internal/ateinterceptors" + "github.com/agent-substrate/substrate/internal/ateompath" + "github.com/agent-substrate/substrate/internal/memorypullcache" + "github.com/agent-substrate/substrate/internal/proto/ateletpb" + "github.com/agent-substrate/substrate/internal/proto/ateompb" + "github.com/agent-substrate/substrate/internal/serverboot" + "github.com/agent-substrate/substrate/internal/version" ) var ( diff --git a/cmd/atelet/oci.go b/cmd/atelet/oci.go index 3bf7503f6..e6dfa022f 100644 --- a/cmd/atelet/oci.go +++ b/cmd/atelet/oci.go @@ -27,11 +27,12 @@ import ( "path/filepath" "strings" - "github.com/agent-substrate/substrate/internal/ateompath" - "github.com/agent-substrate/substrate/internal/memorypullcache" "github.com/opencontainers/runtime-spec/specs-go" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" + + "github.com/agent-substrate/substrate/internal/ateompath" + "github.com/agent-substrate/substrate/internal/memorypullcache" ) func prepareOCIDirectory(ctx context.Context, pullCache *memorypullcache.MemoryPullCache, actorTemplateNamespace, actorTemplateName, actorID, containerName, ref string, args []string, env []string, annotations map[string]string, netns string) error { diff --git a/cmd/atenet/internal/app/dns/cmd.go b/cmd/atenet/internal/app/dns/cmd.go index a8a68c440..2cd7bae40 100644 --- a/cmd/atenet/internal/app/dns/cmd.go +++ b/cmd/atenet/internal/app/dns/cmd.go @@ -24,11 +24,12 @@ import ( "syscall" "time" - "github.com/agent-substrate/substrate/internal/dns" "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" + + "github.com/agent-substrate/substrate/internal/dns" ) type DnsConfig struct { diff --git a/cmd/atenet/internal/app/root.go b/cmd/atenet/internal/app/root.go index 1483fca40..184b38e71 100644 --- a/cmd/atenet/internal/app/root.go +++ b/cmd/atenet/internal/app/root.go @@ -18,10 +18,11 @@ import ( "fmt" "os" + "github.com/spf13/cobra" + "github.com/agent-substrate/substrate/cmd/atenet/internal/app/dns" "github.com/agent-substrate/substrate/cmd/atenet/internal/app/router" "github.com/agent-substrate/substrate/internal/version" - "github.com/spf13/cobra" ) var rootCmd = &cobra.Command{ diff --git a/cmd/atenet/internal/app/router/atstore.go b/cmd/atenet/internal/app/router/atstore.go index 62f7e0fd4..61e23e44b 100644 --- a/cmd/atenet/internal/app/router/atstore.go +++ b/cmd/atenet/internal/app/router/atstore.go @@ -18,8 +18,9 @@ import ( "context" "fmt" - v1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/client" + + v1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" ) // atStore defines an interface for retrieving a collection of ActorTemplates. diff --git a/cmd/atenet/internal/app/router/atstore_file.go b/cmd/atenet/internal/app/router/atstore_file.go index 760da68e4..722e84a55 100644 --- a/cmd/atenet/internal/app/router/atstore_file.go +++ b/cmd/atenet/internal/app/router/atstore_file.go @@ -24,9 +24,10 @@ import ( "os" "strings" - v1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" "k8s.io/apimachinery/pkg/util/yaml" sigsyaml "sigs.k8s.io/yaml" + + v1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" ) // fileATStore implements the atStore interface by reading and decoding YAML or JSON diff --git a/cmd/atenet/internal/app/router/extproc_in.go b/cmd/atenet/internal/app/router/extproc_in.go index a394f98da..67a68c3ea 100644 --- a/cmd/atenet/internal/app/router/extproc_in.go +++ b/cmd/atenet/internal/app/router/extproc_in.go @@ -19,8 +19,9 @@ import ( "net" "strings" - "github.com/agent-substrate/substrate/internal/resources" corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" + + "github.com/agent-substrate/substrate/internal/resources" ) type requestMetadata struct { diff --git a/cmd/atenet/internal/app/router/extproc_test.go b/cmd/atenet/internal/app/router/extproc_test.go index 3d66775de..699568130 100644 --- a/cmd/atenet/internal/app/router/extproc_test.go +++ b/cmd/atenet/internal/app/router/extproc_test.go @@ -21,13 +21,14 @@ import ( "testing" "time" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3" envoy_type "github.com/envoyproxy/go-control-plane/envoy/type/v3" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) type mockClient struct { diff --git a/cmd/atenet/internal/app/router/health.go b/cmd/atenet/internal/app/router/health.go index 62ae1ae02..b2280fa95 100644 --- a/cmd/atenet/internal/app/router/health.go +++ b/cmd/atenet/internal/app/router/health.go @@ -24,8 +24,9 @@ import ( "sync" "time" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "k8s.io/client-go/kubernetes" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) type ComponentHealth struct { diff --git a/cmd/atenet/internal/app/router/resumer.go b/cmd/atenet/internal/app/router/resumer.go index 2f9a420f9..c7dd0aef1 100644 --- a/cmd/atenet/internal/app/router/resumer.go +++ b/cmd/atenet/internal/app/router/resumer.go @@ -18,11 +18,12 @@ import ( "context" "time" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "golang.org/x/sync/singleflight" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/util/wait" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) // ActorResumer coordinates safe, deduplicated resumption of actors. diff --git a/cmd/atenet/internal/app/router/resumer_test.go b/cmd/atenet/internal/app/router/resumer_test.go index 8e10f7f57..c491bf7dd 100644 --- a/cmd/atenet/internal/app/router/resumer_test.go +++ b/cmd/atenet/internal/app/router/resumer_test.go @@ -20,10 +20,11 @@ import ( "testing" "time" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) type resumerMockClient struct { diff --git a/cmd/ateom-gvisor/main.go b/cmd/ateom-gvisor/main.go index cc3aab45c..4ee282f2f 100644 --- a/cmd/ateom-gvisor/main.go +++ b/cmd/ateom-gvisor/main.go @@ -28,13 +28,6 @@ import ( "sync" "cloud.google.com/go/compute/metadata" - "github.com/agent-substrate/substrate/cmd/ateom-gvisor/internal/ateom" - "github.com/agent-substrate/substrate/internal/ateinterceptors" - "github.com/agent-substrate/substrate/internal/ateompath" - "github.com/agent-substrate/substrate/internal/contextlogging" - "github.com/agent-substrate/substrate/internal/proto/ateompb" - "github.com/agent-substrate/substrate/internal/serverboot" - "github.com/agent-substrate/substrate/internal/version" "github.com/hashicorp/go-reap" "github.com/vishvananda/netlink" "github.com/vishvananda/netns" @@ -42,6 +35,14 @@ import ( sdktrace "go.opentelemetry.io/otel/sdk/trace" "google.golang.org/grpc" "google.golang.org/grpc/reflection" + + "github.com/agent-substrate/substrate/cmd/ateom-gvisor/internal/ateom" + "github.com/agent-substrate/substrate/internal/ateinterceptors" + "github.com/agent-substrate/substrate/internal/ateompath" + "github.com/agent-substrate/substrate/internal/contextlogging" + "github.com/agent-substrate/substrate/internal/proto/ateompb" + "github.com/agent-substrate/substrate/internal/serverboot" + "github.com/agent-substrate/substrate/internal/version" ) var ( diff --git a/cmd/kubectl-ate/internal/cmd/admin_debug_redis_flush.go b/cmd/kubectl-ate/internal/cmd/admin_debug_redis_flush.go index 63fd6af0c..565c6bc84 100644 --- a/cmd/kubectl-ate/internal/cmd/admin_debug_redis_flush.go +++ b/cmd/kubectl-ate/internal/cmd/admin_debug_redis_flush.go @@ -17,9 +17,10 @@ package cmd import ( "fmt" + "github.com/spf13/cobra" + "github.com/agent-substrate/substrate/internal/ateclient" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "github.com/spf13/cobra" ) var debugRedisFlushCmd = &cobra.Command{ diff --git a/cmd/kubectl-ate/internal/cmd/admin_make_ca_pool.go b/cmd/kubectl-ate/internal/cmd/admin_make_ca_pool.go index ab42f2690..5d129ca12 100644 --- a/cmd/kubectl-ate/internal/cmd/admin_make_ca_pool.go +++ b/cmd/kubectl-ate/internal/cmd/admin_make_ca_pool.go @@ -17,12 +17,13 @@ package cmd import ( "fmt" - "github.com/agent-substrate/substrate/internal/ateclient" - "github.com/agent-substrate/substrate/internal/localca" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + + "github.com/agent-substrate/substrate/internal/ateclient" + "github.com/agent-substrate/substrate/internal/localca" ) var caID string diff --git a/cmd/kubectl-ate/internal/cmd/admin_make_jwt_pool.go b/cmd/kubectl-ate/internal/cmd/admin_make_jwt_pool.go index 1ee309ff6..30f0fdaf9 100644 --- a/cmd/kubectl-ate/internal/cmd/admin_make_jwt_pool.go +++ b/cmd/kubectl-ate/internal/cmd/admin_make_jwt_pool.go @@ -17,12 +17,13 @@ package cmd import ( "fmt" - "github.com/agent-substrate/substrate/internal/ateclient" - "github.com/agent-substrate/substrate/internal/localjwtauthority" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + + "github.com/agent-substrate/substrate/internal/ateclient" + "github.com/agent-substrate/substrate/internal/localjwtauthority" ) var keyID string diff --git a/cmd/kubectl-ate/internal/cmd/create_actor.go b/cmd/kubectl-ate/internal/cmd/create_actor.go index cd3a4b6b3..f9285bc38 100644 --- a/cmd/kubectl-ate/internal/cmd/create_actor.go +++ b/cmd/kubectl-ate/internal/cmd/create_actor.go @@ -18,10 +18,11 @@ import ( "fmt" "strings" + "github.com/spf13/cobra" + "github.com/agent-substrate/substrate/cmd/kubectl-ate/internal/printer" "github.com/agent-substrate/substrate/internal/ateclient" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "github.com/spf13/cobra" ) var templateFlag string diff --git a/cmd/kubectl-ate/internal/cmd/delete_actor.go b/cmd/kubectl-ate/internal/cmd/delete_actor.go index 54a12df34..75aa6ac94 100644 --- a/cmd/kubectl-ate/internal/cmd/delete_actor.go +++ b/cmd/kubectl-ate/internal/cmd/delete_actor.go @@ -17,9 +17,10 @@ package cmd import ( "fmt" + "github.com/spf13/cobra" + "github.com/agent-substrate/substrate/internal/ateclient" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "github.com/spf13/cobra" ) var deleteActorCmd = &cobra.Command{ diff --git a/cmd/kubectl-ate/internal/cmd/get_actors.go b/cmd/kubectl-ate/internal/cmd/get_actors.go index 3ec2ba760..d1044ba64 100644 --- a/cmd/kubectl-ate/internal/cmd/get_actors.go +++ b/cmd/kubectl-ate/internal/cmd/get_actors.go @@ -17,10 +17,11 @@ package cmd import ( "fmt" + "github.com/spf13/cobra" + "github.com/agent-substrate/substrate/cmd/kubectl-ate/internal/printer" "github.com/agent-substrate/substrate/internal/ateclient" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "github.com/spf13/cobra" ) var getActorsCmd = &cobra.Command{ diff --git a/cmd/kubectl-ate/internal/cmd/get_workers.go b/cmd/kubectl-ate/internal/cmd/get_workers.go index 2d9155680..b064e7171 100644 --- a/cmd/kubectl-ate/internal/cmd/get_workers.go +++ b/cmd/kubectl-ate/internal/cmd/get_workers.go @@ -17,10 +17,11 @@ package cmd import ( "fmt" + "github.com/spf13/cobra" + "github.com/agent-substrate/substrate/cmd/kubectl-ate/internal/printer" "github.com/agent-substrate/substrate/internal/ateclient" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "github.com/spf13/cobra" ) var getWorkersCmd = &cobra.Command{ diff --git a/cmd/kubectl-ate/internal/cmd/logs_actors.go b/cmd/kubectl-ate/internal/cmd/logs_actors.go index 2b8187870..cfa48a498 100644 --- a/cmd/kubectl-ate/internal/cmd/logs_actors.go +++ b/cmd/kubectl-ate/internal/cmd/logs_actors.go @@ -27,8 +27,6 @@ import ( "sync" "time" - "github.com/agent-substrate/substrate/internal/ateclient" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "github.com/spf13/cobra" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -36,6 +34,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + + "github.com/agent-substrate/substrate/internal/ateclient" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) var followLogs bool diff --git a/cmd/kubectl-ate/internal/cmd/logs_actors_test.go b/cmd/kubectl-ate/internal/cmd/logs_actors_test.go index 97ce505e8..ba9ef4779 100644 --- a/cmd/kubectl-ate/internal/cmd/logs_actors_test.go +++ b/cmd/kubectl-ate/internal/cmd/logs_actors_test.go @@ -24,11 +24,12 @@ import ( "testing" "time" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" corev1 "k8s.io/api/core/v1" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) func TestFilterAndDisplayLogLine(t *testing.T) { diff --git a/cmd/kubectl-ate/internal/cmd/resume_actor.go b/cmd/kubectl-ate/internal/cmd/resume_actor.go index 440643abf..b1167f54f 100644 --- a/cmd/kubectl-ate/internal/cmd/resume_actor.go +++ b/cmd/kubectl-ate/internal/cmd/resume_actor.go @@ -17,10 +17,11 @@ package cmd import ( "fmt" + "github.com/spf13/cobra" + "github.com/agent-substrate/substrate/cmd/kubectl-ate/internal/printer" "github.com/agent-substrate/substrate/internal/ateclient" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "github.com/spf13/cobra" ) var bootFlag bool diff --git a/cmd/kubectl-ate/internal/cmd/suspend_actor.go b/cmd/kubectl-ate/internal/cmd/suspend_actor.go index c36506a9a..83d323bce 100644 --- a/cmd/kubectl-ate/internal/cmd/suspend_actor.go +++ b/cmd/kubectl-ate/internal/cmd/suspend_actor.go @@ -17,10 +17,11 @@ package cmd import ( "fmt" + "github.com/spf13/cobra" + "github.com/agent-substrate/substrate/cmd/kubectl-ate/internal/printer" "github.com/agent-substrate/substrate/internal/ateclient" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - "github.com/spf13/cobra" ) var suspendActorCmd = &cobra.Command{ diff --git a/cmd/kubectl-ate/internal/printer/printer.go b/cmd/kubectl-ate/internal/printer/printer.go index 12312e089..55f60062f 100644 --- a/cmd/kubectl-ate/internal/printer/printer.go +++ b/cmd/kubectl-ate/internal/printer/printer.go @@ -23,10 +23,11 @@ import ( "slices" "text/tabwriter" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" "sigs.k8s.io/yaml" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) // PrintActors prints a slice of actors to stdout in the requested format. diff --git a/cmd/kubectl-ate/internal/printer/printer_test.go b/cmd/kubectl-ate/internal/printer/printer_test.go index 69f55bfc4..11efc052a 100644 --- a/cmd/kubectl-ate/internal/printer/printer_test.go +++ b/cmd/kubectl-ate/internal/printer/printer_test.go @@ -18,8 +18,9 @@ import ( "bytes" "testing" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "github.com/google/go-cmp/cmp" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) func TestPrintActorsTo_Table(t *testing.T) { diff --git a/cmd/podcertcontroller/main.go b/cmd/podcertcontroller/main.go index a6fb744d9..fb0d278ec 100644 --- a/cmd/podcertcontroller/main.go +++ b/cmd/podcertcontroller/main.go @@ -31,18 +31,19 @@ import ( "path/filepath" "syscall" - "github.com/agent-substrate/substrate/internal/localca" - "github.com/agent-substrate/substrate/internal/podidentitysigner" - "github.com/agent-substrate/substrate/internal/rendezvous" - "github.com/agent-substrate/substrate/internal/servicednssigner" - "github.com/agent-substrate/substrate/internal/signercontroller" - "github.com/agent-substrate/substrate/internal/version" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" "k8s.io/utils/clock" + + "github.com/agent-substrate/substrate/internal/localca" + "github.com/agent-substrate/substrate/internal/podidentitysigner" + "github.com/agent-substrate/substrate/internal/rendezvous" + "github.com/agent-substrate/substrate/internal/servicednssigner" + "github.com/agent-substrate/substrate/internal/signercontroller" + "github.com/agent-substrate/substrate/internal/version" ) var kubeConfigDefault string diff --git a/demos/agent-secret/main.go b/demos/agent-secret/main.go index 62ce52634..858178b74 100644 --- a/demos/agent-secret/main.go +++ b/demos/agent-secret/main.go @@ -25,9 +25,10 @@ import ( "strings" "time" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) var residentSecret string diff --git a/demos/claude-code-multiplex/ui/server.go b/demos/claude-code-multiplex/ui/server.go index 5a7355c32..466ff4f89 100644 --- a/demos/claude-code-multiplex/ui/server.go +++ b/demos/claude-code-multiplex/ui/server.go @@ -49,13 +49,14 @@ import ( "sync" "time" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) const ( diff --git a/demos/sandbox/client/main.go b/demos/sandbox/client/main.go index 9bb81e60e..00e1e6a1d 100644 --- a/demos/sandbox/client/main.go +++ b/demos/sandbox/client/main.go @@ -29,9 +29,10 @@ import ( "strings" "syscall" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) type ProcessRequest struct { diff --git a/internal/ateclient/builder.go b/internal/ateclient/builder.go index 81ca867ec..f32219ef0 100644 --- a/internal/ateclient/builder.go +++ b/internal/ateclient/builder.go @@ -23,7 +23,6 @@ import ( "os" "sync" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" @@ -32,7 +31,6 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.21.0" "google.golang.org/grpc" "google.golang.org/grpc/credentials" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes" @@ -40,6 +38,8 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/portforward" "k8s.io/client-go/transport/spdy" + + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) // Client wraps the gRPC ControlClient and ensures the port-forward connection is closed when done. diff --git a/internal/controllers/actortemplate_controller.go b/internal/controllers/actortemplate_controller.go index 3df86bc4e..d54ac9eb8 100644 --- a/internal/controllers/actortemplate_controller.go +++ b/internal/controllers/actortemplate_controller.go @@ -19,8 +19,6 @@ import ( "fmt" "time" - atev1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" - "github.com/agent-substrate/substrate/pkg/proto/ateapipb" "github.com/google/uuid" k8errors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -28,6 +26,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + + atev1alpha1 "github.com/agent-substrate/substrate/pkg/api/v1alpha1" + "github.com/agent-substrate/substrate/pkg/proto/ateapipb" ) const ( diff --git a/internal/dns/dns.go b/internal/dns/dns.go index cf2db99b6..785a5051d 100644 --- a/internal/dns/dns.go +++ b/internal/dns/dns.go @@ -26,11 +26,12 @@ import ( "syscall" "time" - "github.com/agent-substrate/substrate/internal/resources" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/agent-substrate/substrate/internal/resources" ) const ( diff --git a/internal/e2e/clients.go b/internal/e2e/clients.go index 982cfec3c..26d2dc2ff 100644 --- a/internal/e2e/clients.go +++ b/internal/e2e/clients.go @@ -19,10 +19,11 @@ import ( "fmt" "time" - "github.com/agent-substrate/substrate/internal/ateclient" - "github.com/agent-substrate/substrate/pkg/client/clientset/versioned" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/kubernetes" + + "github.com/agent-substrate/substrate/internal/ateclient" + "github.com/agent-substrate/substrate/pkg/client/clientset/versioned" ) type Clients struct { diff --git a/internal/e2e/suites/demo/demo_test.go b/internal/e2e/suites/demo/demo_test.go index b1c2e5b09..8f2ea1f32 100644 --- a/internal/e2e/suites/demo/demo_test.go +++ b/internal/e2e/suites/demo/demo_test.go @@ -19,11 +19,12 @@ import ( "testing" "time" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/agent-substrate/substrate/internal/e2e" "github.com/agent-substrate/substrate/pkg/api/v1alpha1" "github.com/agent-substrate/substrate/pkg/proto/ateapipb" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestDemo3(t *testing.T) { diff --git a/internal/podidentitysigner/podidentitysigner.go b/internal/podidentitysigner/podidentitysigner.go index 28f2e5d32..c8629a04a 100644 --- a/internal/podidentitysigner/podidentitysigner.go +++ b/internal/podidentitysigner/podidentitysigner.go @@ -25,14 +25,15 @@ import ( "path" "time" - "github.com/agent-substrate/substrate/internal/localca" - "github.com/agent-substrate/substrate/internal/podcertificate" - "github.com/agent-substrate/substrate/internal/signercontroller" certsv1beta1 "k8s.io/api/certificates/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/utils/clock" "k8s.io/utils/ptr" + + "github.com/agent-substrate/substrate/internal/localca" + "github.com/agent-substrate/substrate/internal/podcertificate" + "github.com/agent-substrate/substrate/internal/signercontroller" ) const Name = "podidentity.podcert.ate.dev/identity" diff --git a/internal/serverboot/serverboot.go b/internal/serverboot/serverboot.go index 21b135cb1..7fc83afd1 100644 --- a/internal/serverboot/serverboot.go +++ b/internal/serverboot/serverboot.go @@ -26,7 +26,6 @@ import ( "net/http" "os" - "github.com/agent-substrate/substrate/internal/contextlogging" "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus/promhttp" "go.opentelemetry.io/otel" @@ -38,6 +37,8 @@ import ( "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + + "github.com/agent-substrate/substrate/internal/contextlogging" ) // InitLogger sets the global slog logger to a JSON handler wrapped in diff --git a/internal/servicednssigner/servicednssigner.go b/internal/servicednssigner/servicednssigner.go index f44fbe50b..f0688f1e9 100644 --- a/internal/servicednssigner/servicednssigner.go +++ b/internal/servicednssigner/servicednssigner.go @@ -23,15 +23,16 @@ import ( "fmt" "time" - "github.com/agent-substrate/substrate/internal/localca" - "github.com/agent-substrate/substrate/internal/podcertificate" - "github.com/agent-substrate/substrate/internal/signercontroller" certsv1beta1 "k8s.io/api/certificates/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/utils/clock" "k8s.io/utils/ptr" + + "github.com/agent-substrate/substrate/internal/localca" + "github.com/agent-substrate/substrate/internal/podcertificate" + "github.com/agent-substrate/substrate/internal/signercontroller" ) const Name = "servicedns.podcert.ate.dev/identity" diff --git a/internal/signercontroller/signercontroller.go b/internal/signercontroller/signercontroller.go index 31fd74445..8c589d943 100644 --- a/internal/signercontroller/signercontroller.go +++ b/internal/signercontroller/signercontroller.go @@ -21,7 +21,6 @@ import ( "log/slog" "time" - "github.com/agent-substrate/substrate/internal/rendezvous" certsv1beta1 "k8s.io/api/certificates/v1beta1" apiequality "k8s.io/apimachinery/pkg/api/equality" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -33,6 +32,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/utils/clock" + + "github.com/agent-substrate/substrate/internal/rendezvous" ) type SignerImpl interface {