From 3f6f7a5e53ba1649ca9d129fb9da1e27320cf06d Mon Sep 17 00:00:00 2001 From: joshsiv-mulga Date: Fri, 2 Oct 2026 15:25:51 +1000 Subject: [PATCH] chore: resolve lint findings from package-boundary moves --- cmd/rds-agent/agent.go | 2 +- cmd/spinifex/cmd/admin_jsprobe_test.go | 2 +- cmd/spinifex/cmd/get_dhcp_leases_test.go | 2 +- spinifex/accountteardown/cluster.go | 2 +- spinifex/accountteardown/cluster_test.go | 2 +- spinifex/accountteardown/reapers_account_test.go | 4 ++-- spinifex/accountteardown/reapers_ec2_test.go | 2 +- spinifex/accountteardown/reapers_ecs_test.go | 2 +- spinifex/accountteardown/reapers_eks_test.go | 2 +- spinifex/accountteardown/reapers_iam_test.go | 2 +- spinifex/accountteardown/reapers_rds_test.go | 2 +- spinifex/daemon/capacityreservation.go | 2 +- spinifex/daemon/daemon_handlers_capacityreservation.go | 2 +- spinifex/daemon/daemon_handlers_eks_test.go | 2 +- spinifex/daemon/daemon_handlers_vpc_test.go | 2 +- spinifex/daemon/daemon_system_dispatch.go | 2 +- spinifex/daemon/daemon_system_instance_test.go | 4 ++-- spinifex/daemon/dns_reconcile.go | 4 ++-- spinifex/daemon/dns_reconcile_test.go | 4 ++-- spinifex/daemon/eni_orphan_reaper_test.go | 2 +- spinifex/daemon/instance_records_rekey_test.go | 2 +- spinifex/daemon/instance_records_test.go | 2 +- spinifex/daemon/instance_records_transition_test.go | 2 +- spinifex/daemon/instance_running_set_test.go | 2 +- spinifex/daemon/local_api.go | 2 +- spinifex/daemon/vpc_adapter_test.go | 2 +- spinifex/domains/ecr/auth/ecrauth_test.go | 2 +- spinifex/domains/ecr/auth/signingkey.go | 2 +- spinifex/domains/ecr/awsapi/lifecycle_preview_actions.go | 8 ++------ spinifex/domains/ecr/awsapi/registry_actions.go | 8 ++------ spinifex/domains/ecr/awsapi/repository_actions.go | 8 ++------ spinifex/foundation/lifecycle/idempotency/store_test.go | 2 +- .../foundation/lifecycle/reconciler/reconciler_test.go | 4 ++-- spinifex/foundation/state/kvlease/lease_test.go | 2 +- spinifex/foundation/state/kvstore/recovery_test.go | 2 +- spinifex/foundation/state/kvstore/snapshot_test.go | 2 +- spinifex/foundation/state/kvstore/store_test.go | 2 +- spinifex/foundation/state/kvutil/cas_conflict_test.go | 2 +- spinifex/gateway/admin_accountquota_test.go | 2 +- spinifex/gateway/admin_createaccount.go | 2 +- spinifex/gateway/admin_createaccount_test.go | 6 +++--- spinifex/gateway/auth_test.go | 2 +- spinifex/gateway/bedrock/access_test.go | 2 +- spinifex/gateway/bedrock/credentials.go | 2 +- spinifex/gateway/bedrock/credentials_test.go | 2 +- spinifex/gateway/bedrock/guardrail_test.go | 2 +- spinifex/gateway/bedrock/logging.go | 2 +- spinifex/gateway/bedrock/provisioned_test.go | 2 +- spinifex/gateway/bedrock_request_test.go | 2 +- spinifex/gateway/bedrockagent_request_test.go | 2 +- spinifex/gateway/bedrockagent_test.go | 2 +- spinifex/gateway/bedrockagentruntime_request_test.go | 2 +- spinifex/gateway/ec2/authz.go | 2 +- spinifex/gateway/ec2/authz_test.go | 2 +- spinifex/gateway/ec2/instance/RunInstances_test.go | 2 +- spinifex/gateway/ec2/instance/clienttoken.go | 2 +- spinifex/gateway/ec2/instance/clienttoken_test.go | 2 +- spinifex/gateway/ec2/volume/DetachVolume_test.go | 2 +- spinifex/gateway/ec2_idempotency.go | 2 +- spinifex/gateway/ec2_idempotency_test.go | 2 +- spinifex/gateway/ecs/authz_test.go | 2 +- spinifex/gateway/ecs/clienttoken_test.go | 2 +- spinifex/gateway/eks/internal_authz_test.go | 2 +- spinifex/gateway/eks/internal_publish_test.go | 2 +- spinifex/gateway/eks/token_review_test.go | 2 +- spinifex/gateway/eks_authz_test.go | 2 +- spinifex/gateway/elbv2/authz.go | 2 +- spinifex/gateway/elbv2/dispatch_test.go | 2 +- spinifex/gateway/elbv2/listener_certs_test.go | 2 +- spinifex/gateway/oidc_discovery_test.go | 2 +- spinifex/gateway/ratelimit_test.go | 2 +- spinifex/gateway/rds/enginecatalog_test.go | 2 +- spinifex/gateway/rds/handler_test.go | 2 +- spinifex/gateway/rds_test.go | 2 +- spinifex/gateway/spinifex_modelaccess_test.go | 2 +- spinifex/handlers/bedrock/launch_test.go | 2 +- spinifex/handlers/bedrock/reaper.go | 2 +- spinifex/handlers/bedrock/service_nats_test.go | 2 +- spinifex/handlers/bedrock/store_test.go | 2 +- spinifex/handlers/dns/reconcile_election_test.go | 2 +- spinifex/handlers/dns/reconcile_test.go | 4 ++-- spinifex/handlers/ec2/eip/service_impl_test.go | 2 +- spinifex/handlers/ec2/image/ami_source_volume_test.go | 2 +- spinifex/handlers/ec2/image/service_nats_test.go | 2 +- spinifex/handlers/ec2/instance/data_volumes_test.go | 2 +- spinifex/handlers/ec2/spotinstance/service_impl_test.go | 2 +- spinifex/handlers/ec2/volume/force_detach_test.go | 2 +- .../ec2/volume/get_volume_metadata_provider_test.go | 2 +- spinifex/handlers/ec2/vpc/eni_test.go | 2 +- spinifex/handlers/ec2/vpc/external_ipam_test.go | 2 +- spinifex/handlers/ecs/capacity_test.go | 2 +- spinifex/handlers/ecs/revisit_test.go | 2 +- spinifex/handlers/ecs/scheduler.go | 4 ++-- spinifex/handlers/ecs/service_test.go | 2 +- spinifex/handlers/ecs/store.go | 2 +- spinifex/handlers/eks/addon_status_reconciler_test.go | 2 +- spinifex/handlers/eks/addons_test.go | 2 +- spinifex/handlers/eks/clienttoken_test.go | 2 +- spinifex/handlers/eks/cluster_reconciler.go | 2 +- spinifex/handlers/eks/cp_vpc.go | 2 +- spinifex/handlers/eks/delete_cluster_test.go | 2 +- spinifex/handlers/eks/k3s_server_vm_test.go | 2 +- spinifex/handlers/eks/nats_bootstrap_test.go | 2 +- spinifex/handlers/eks/nlb.go | 2 +- spinifex/handlers/eks/nlb_test.go | 2 +- spinifex/handlers/eks/nodegroup.go | 4 ++-- spinifex/handlers/eks/nodegroup_test.go | 4 ++-- spinifex/handlers/eks/recovery_directive_test.go | 2 +- spinifex/handlers/eks/service_impl_test.go | 2 +- spinifex/handlers/eks/store.go | 2 +- spinifex/handlers/eks/watch_source_test.go | 4 ++-- spinifex/handlers/elbv2/health_checker_test.go | 2 +- spinifex/handlers/elbv2/service_impl_health_test.go | 2 +- spinifex/handlers/elbv2/service_nats_e2e_test.go | 2 +- spinifex/handlers/iam/account_lifecycle_test.go | 2 +- spinifex/handlers/iam/account_names_test.go | 2 +- spinifex/handlers/iam/provision_test.go | 2 +- spinifex/handlers/iam/service_impl_test.go | 2 +- spinifex/handlers/imds/metadata.go | 2 +- spinifex/handlers/imds/nats_clients_test.go | 2 +- spinifex/handlers/imds/service.go | 2 +- spinifex/handlers/ochrevector/api_test.go | 2 +- spinifex/handlers/ochrevector/appliance.go | 2 +- spinifex/handlers/ochrevector/appliance_test.go | 2 +- spinifex/handlers/ochrevector/rds_launcher_test.go | 2 +- spinifex/handlers/quota/bedrock_test.go | 2 +- spinifex/handlers/quota/enforce_test.go | 2 +- spinifex/handlers/quota/records.go | 2 +- spinifex/handlers/quota/records_test.go | 8 ++++---- spinifex/handlers/quota/vcpu.go | 4 ++-- spinifex/handlers/quota/vcpu_test.go | 2 +- spinifex/handlers/rds/agent_test.go | 2 +- spinifex/handlers/rds/bootstrap.go | 2 +- spinifex/handlers/rds/create.go | 2 +- spinifex/handlers/rds/create_test.go | 4 ++-- spinifex/handlers/rds/delete.go | 4 ++-- spinifex/handlers/rds/dns.go | 2 +- spinifex/handlers/rds/modify_test.go | 6 +++--- spinifex/handlers/rds/paramcatalog.go | 2 +- spinifex/handlers/rds/reconciler.go | 2 +- spinifex/handlers/rds/restore.go | 2 +- spinifex/handlers/rds/restore_test.go | 2 +- spinifex/handlers/rds/sizing.go | 2 +- spinifex/handlers/rds/sizing_test.go | 2 +- spinifex/handlers/rds/snapshot.go | 2 +- spinifex/handlers/rds/snapshot_test.go | 6 +++--- spinifex/handlers/rds/store.go | 2 +- spinifex/handlers/rds/watch_source_test.go | 4 ++-- .../handlers/sts/assume_role_with_web_identity_test.go | 2 +- spinifex/handlers/sts/oidc_jwks_test.go | 2 +- spinifex/handlers/sts/service_impl.go | 2 +- spinifex/handlers/sts/service_impl_test.go | 2 +- spinifex/network/external/dhcp/iface_mac_test.go | 2 +- spinifex/network/external/dhcp/kv_test.go | 2 +- spinifex/network/external/dhcp/lrp_allocator_test.go | 2 +- spinifex/network/external/dhcp/manager_test.go | 2 +- spinifex/network/external/dhcp/pool_allocator_test.go | 2 +- spinifex/network/external/ocinet/affinity_test.go | 2 +- spinifex/network/external/ocinet/allocator.go | 2 +- spinifex/network/external/ocinet/allocator_test.go | 2 +- spinifex/network/external/ocinet/owner_test.go | 2 +- spinifex/network/external/ocinet/reconcile.go | 2 +- spinifex/network/external/ocinet/reconcile_test.go | 2 +- spinifex/network/external/ocinet/wiring.go | 2 +- spinifex/network/external/static_pool_test.go | 2 +- spinifex/network/reconcile/drift.go | 6 +++--- spinifex/network/reconcile/drift_watch_test.go | 4 ++-- spinifex/network/reconcile/intent.go | 2 +- spinifex/network/reconcile/intent_test.go | 2 +- spinifex/network/reconcile/scenario_kv_live_test.go | 2 +- spinifex/network/subscribers/subscribers_test.go | 2 +- spinifex/runtime/compute/cache/cache.go | 2 ++ spinifex/runtime/service/service.go | 6 +++--- spinifex/services/awsgw/eks_token_verify_test.go | 2 +- spinifex/services/awsgw/quota_reconcile_test.go | 2 +- spinifex/services/viperblockd/provider_tracing_test.go | 2 +- spinifex/utils/nats_test.go | 2 +- spinifex/vpcd/host_eip_loop.go | 2 +- spinifex/vpcd/lease_datapath_reconcile_test.go | 2 +- spinifex/vpcd/lease_ip_change_test.go | 2 +- spinifex/vpcd/lease_reaper_test.go | 2 +- spinifex/vpcd/ovn_controller_watchdog.go | 2 +- 182 files changed, 214 insertions(+), 224 deletions(-) diff --git a/cmd/rds-agent/agent.go b/cmd/rds-agent/agent.go index 32b2ee8bc..1172bdb46 100644 --- a/cmd/rds-agent/agent.go +++ b/cmd/rds-agent/agent.go @@ -14,8 +14,8 @@ import ( "github.com/mulgadc/spinifex/internal/gwsign" "github.com/mulgadc/spinifex/internal/rdsgw" - handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" + handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" ) // Overridable via -ldflags "-X main.version=...". diff --git a/cmd/spinifex/cmd/admin_jsprobe_test.go b/cmd/spinifex/cmd/admin_jsprobe_test.go index 101578924..d5d926ee3 100644 --- a/cmd/spinifex/cmd/admin_jsprobe_test.go +++ b/cmd/spinifex/cmd/admin_jsprobe_test.go @@ -12,8 +12,8 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/daemon" ) func newCanaryBucket(t *testing.T) (jetstream.KeyValue, jetstream.JetStream) { diff --git a/cmd/spinifex/cmd/get_dhcp_leases_test.go b/cmd/spinifex/cmd/get_dhcp_leases_test.go index 7db6d7ee6..5fba3320a 100644 --- a/cmd/spinifex/cmd/get_dhcp_leases_test.go +++ b/cmd/spinifex/cmd/get_dhcp_leases_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/accountteardown/cluster.go b/spinifex/accountteardown/cluster.go index 28a068ebb..33e47f1e7 100644 --- a/spinifex/accountteardown/cluster.go +++ b/spinifex/accountteardown/cluster.go @@ -5,9 +5,9 @@ import ( "fmt" "log/slog" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/accountteardown/cluster_test.go b/spinifex/accountteardown/cluster_test.go index b0dacbb9f..64685923f 100644 --- a/spinifex/accountteardown/cluster_test.go +++ b/spinifex/accountteardown/cluster_test.go @@ -6,8 +6,8 @@ package accountteardown import ( "testing" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/accountteardown/reapers_account_test.go b/spinifex/accountteardown/reapers_account_test.go index 29d23658f..cbcf9a0f5 100644 --- a/spinifex/accountteardown/reapers_account_test.go +++ b/spinifex/accountteardown/reapers_account_test.go @@ -9,9 +9,9 @@ import ( "errors" "testing" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/accountteardown/reapers_ec2_test.go b/spinifex/accountteardown/reapers_ec2_test.go index 14d10a5f5..6a0b3ff67 100644 --- a/spinifex/accountteardown/reapers_ec2_test.go +++ b/spinifex/accountteardown/reapers_ec2_test.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/accountteardown/reapers_ecs_test.go b/spinifex/accountteardown/reapers_ecs_test.go index c3e8db3fd..03764bc52 100644 --- a/spinifex/accountteardown/reapers_ecs_test.go +++ b/spinifex/accountteardown/reapers_ecs_test.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecs" - handlers_ecs "github.com/mulgadc/spinifex/spinifex/handlers/ecs" "github.com/mulgadc/spinifex/internal/testkit" + handlers_ecs "github.com/mulgadc/spinifex/spinifex/handlers/ecs" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/accountteardown/reapers_eks_test.go b/spinifex/accountteardown/reapers_eks_test.go index 9b2e66526..df3bf8e3b 100644 --- a/spinifex/accountteardown/reapers_eks_test.go +++ b/spinifex/accountteardown/reapers_eks_test.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/eks" - handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/mulgadc/spinifex/internal/testkit" + handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/accountteardown/reapers_iam_test.go b/spinifex/accountteardown/reapers_iam_test.go index c49f315a3..70531a0fc 100644 --- a/spinifex/accountteardown/reapers_iam_test.go +++ b/spinifex/accountteardown/reapers_iam_test.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/accountteardown/reapers_rds_test.go b/spinifex/accountteardown/reapers_rds_test.go index 07ee42fcd..d6eec8887 100644 --- a/spinifex/accountteardown/reapers_rds_test.go +++ b/spinifex/accountteardown/reapers_rds_test.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/rds" - handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" "github.com/mulgadc/spinifex/internal/testkit" + handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/capacityreservation.go b/spinifex/daemon/capacityreservation.go index 544e2ea62..94b25f501 100644 --- a/spinifex/daemon/capacityreservation.go +++ b/spinifex/daemon/capacityreservation.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" ) // capacityReservation is an in-memory On-Demand Capacity Reservation pinned to diff --git a/spinifex/daemon/daemon_handlers_capacityreservation.go b/spinifex/daemon/daemon_handlers_capacityreservation.go index 55ac3ea80..0db6c7dcf 100644 --- a/spinifex/daemon/daemon_handlers_capacityreservation.go +++ b/spinifex/daemon/daemon_handlers_capacityreservation.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" ) diff --git a/spinifex/daemon/daemon_handlers_eks_test.go b/spinifex/daemon/daemon_handlers_eks_test.go index 73c98a36c..6e344abb9 100644 --- a/spinifex/daemon/daemon_handlers_eks_test.go +++ b/spinifex/daemon/daemon_handlers_eks_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/daemon_handlers_vpc_test.go b/spinifex/daemon/daemon_handlers_vpc_test.go index 0b02d8dae..f911db282 100644 --- a/spinifex/daemon/daemon_handlers_vpc_test.go +++ b/spinifex/daemon/daemon_handlers_vpc_test.go @@ -8,11 +8,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/admin" handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw" handlers_ec2_routetable "github.com/mulgadc/spinifex/spinifex/handlers/ec2/routetable" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/daemon_system_dispatch.go b/spinifex/daemon/daemon_system_dispatch.go index 190b24cd4..69857f30a 100644 --- a/spinifex/daemon/daemon_system_dispatch.go +++ b/spinifex/daemon/daemon_system_dispatch.go @@ -10,9 +10,9 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" handlers_elbv2 "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" - "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" ) diff --git a/spinifex/daemon/daemon_system_instance_test.go b/spinifex/daemon/daemon_system_instance_test.go index 222723e60..cefc104be 100644 --- a/spinifex/daemon/daemon_system_instance_test.go +++ b/spinifex/daemon/daemon_system_instance_test.go @@ -12,15 +12,15 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" handlers_ec2_eip "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eip" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" "github.com/mulgadc/spinifex/spinifex/network/external" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/dns_reconcile.go b/spinifex/daemon/dns_reconcile.go index d5ef1a2aa..5ae122c94 100644 --- a/spinifex/daemon/dns_reconcile.go +++ b/spinifex/daemon/dns_reconcile.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/aws/aws-sdk-go/aws" + "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" handlers_elbv2 "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" ) // dnsWatchSources names the buckets whose changes should wake the DNS diff --git a/spinifex/daemon/dns_reconcile_test.go b/spinifex/daemon/dns_reconcile_test.go index 413ef5b7d..e54921970 100644 --- a/spinifex/daemon/dns_reconcile_test.go +++ b/spinifex/daemon/dns_reconcile_test.go @@ -8,12 +8,12 @@ import ( "context" "testing" + "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" handlers_elbv2 "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/daemon/eni_orphan_reaper_test.go b/spinifex/daemon/eni_orphan_reaper_test.go index 8dba9c7ce..9ab34eb64 100644 --- a/spinifex/daemon/eni_orphan_reaper_test.go +++ b/spinifex/daemon/eni_orphan_reaper_test.go @@ -8,9 +8,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/daemon/instance_records_rekey_test.go b/spinifex/daemon/instance_records_rekey_test.go index 30d8aca11..ad27e7b66 100644 --- a/spinifex/daemon/instance_records_rekey_test.go +++ b/spinifex/daemon/instance_records_rekey_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/daemon/instance_records_test.go b/spinifex/daemon/instance_records_test.go index 6354cf65e..73b711338 100644 --- a/spinifex/daemon/instance_records_test.go +++ b/spinifex/daemon/instance_records_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/instance_records_transition_test.go b/spinifex/daemon/instance_records_transition_test.go index 11ffc7dfc..dbc2709a0 100644 --- a/spinifex/daemon/instance_records_transition_test.go +++ b/spinifex/daemon/instance_records_transition_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/daemon/instance_running_set_test.go b/spinifex/daemon/instance_running_set_test.go index 19c2baaad..d16e959d4 100644 --- a/spinifex/daemon/instance_running_set_test.go +++ b/spinifex/daemon/instance_running_set_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/daemon/local_api.go b/spinifex/daemon/local_api.go index ecaa84565..4a5af2e80 100644 --- a/spinifex/daemon/local_api.go +++ b/spinifex/daemon/local_api.go @@ -8,8 +8,8 @@ import ( "time" "github.com/go-chi/chi/v5" - "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" + "github.com/mulgadc/spinifex/spinifex/utils" ) // NATS connectivity strings reported by /local/status. diff --git a/spinifex/daemon/vpc_adapter_test.go b/spinifex/daemon/vpc_adapter_test.go index 0bc0b923f..24375a8b1 100644 --- a/spinifex/daemon/vpc_adapter_test.go +++ b/spinifex/daemon/vpc_adapter_test.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/internal/testkit" + handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/domains/ecr/auth/ecrauth_test.go b/spinifex/domains/ecr/auth/ecrauth_test.go index 7ad379c3b..aa6772ada 100644 --- a/spinifex/domains/ecr/auth/ecrauth_test.go +++ b/spinifex/domains/ecr/auth/ecrauth_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/golang-jwt/jwt/v5" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/domains/ecr/auth/signingkey.go b/spinifex/domains/ecr/auth/signingkey.go index 8e9c69f35..390696315 100644 --- a/spinifex/domains/ecr/auth/signingkey.go +++ b/spinifex/domains/ecr/auth/signingkey.go @@ -20,8 +20,8 @@ import ( "strings" "time" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/domains/ecr/awsapi/lifecycle_preview_actions.go b/spinifex/domains/ecr/awsapi/lifecycle_preview_actions.go index 0d9c2e486..c5b30dde7 100644 --- a/spinifex/domains/ecr/awsapi/lifecycle_preview_actions.go +++ b/spinifex/domains/ecr/awsapi/lifecycle_preview_actions.go @@ -3,6 +3,7 @@ package awsapi import ( "context" "errors" + "slices" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" ) @@ -38,12 +39,7 @@ func LifecyclePreviewActionNames() []string { // IsLifecyclePreviewAction reports whether action is handled by the composed // lifecycle-preview capability. func IsLifecyclePreviewAction(action string) bool { - for _, name := range lifecyclePreviewActionNames { - if action == name { - return true - } - } - return false + return slices.Contains(lifecyclePreviewActionNames, action) } // Execute handles a lifecycle-preview ECR JSON action using the caller account diff --git a/spinifex/domains/ecr/awsapi/registry_actions.go b/spinifex/domains/ecr/awsapi/registry_actions.go index f51d6172e..6eb9881f4 100644 --- a/spinifex/domains/ecr/awsapi/registry_actions.go +++ b/spinifex/domains/ecr/awsapi/registry_actions.go @@ -3,6 +3,7 @@ package awsapi import ( "context" "errors" + "slices" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" ) @@ -54,12 +55,7 @@ func RegistryActionNames() []string { // registry capability rather than the NATS action table or a transitional // HTTP adapter. func IsRegistryAction(action string) bool { - for _, name := range registryActionNames { - if action == name { - return true - } - } - return false + return slices.Contains(registryActionNames, action) } // Execute handles a registry-backed ECR JSON action using the caller account diff --git a/spinifex/domains/ecr/awsapi/repository_actions.go b/spinifex/domains/ecr/awsapi/repository_actions.go index ff7d5347b..369fd4c00 100644 --- a/spinifex/domains/ecr/awsapi/repository_actions.go +++ b/spinifex/domains/ecr/awsapi/repository_actions.go @@ -3,6 +3,7 @@ package awsapi import ( "context" "errors" + "slices" handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" @@ -51,12 +52,7 @@ func RepositoryActionNames() []string { // IsRepositoryAction reports whether action is handled by the composed // repository-metadata capability. func IsRepositoryAction(action string) bool { - for _, name := range repositoryActionNames { - if action == name { - return true - } - } - return false + return slices.Contains(repositoryActionNames, action) } // Execute handles a repository ECR JSON action using the caller account diff --git a/spinifex/foundation/lifecycle/idempotency/store_test.go b/spinifex/foundation/lifecycle/idempotency/store_test.go index 144c3b261..7a402cb26 100644 --- a/spinifex/foundation/lifecycle/idempotency/store_test.go +++ b/spinifex/foundation/lifecycle/idempotency/store_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/foundation/lifecycle/reconciler/reconciler_test.go b/spinifex/foundation/lifecycle/reconciler/reconciler_test.go index 1dc1a292e..bb71fbca6 100644 --- a/spinifex/foundation/lifecycle/reconciler/reconciler_test.go +++ b/spinifex/foundation/lifecycle/reconciler/reconciler_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/foundation/state/kvlease/lease_test.go b/spinifex/foundation/state/kvlease/lease_test.go index 9c2fa18d9..cf51a62fa 100644 --- a/spinifex/foundation/state/kvlease/lease_test.go +++ b/spinifex/foundation/state/kvlease/lease_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/foundation/state/kvstore/recovery_test.go b/spinifex/foundation/state/kvstore/recovery_test.go index fb60116a8..5c687c360 100644 --- a/spinifex/foundation/state/kvstore/recovery_test.go +++ b/spinifex/foundation/state/kvstore/recovery_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/foundation/state/kvstore/snapshot_test.go b/spinifex/foundation/state/kvstore/snapshot_test.go index c38cb88f6..fe00f9e96 100644 --- a/spinifex/foundation/state/kvstore/snapshot_test.go +++ b/spinifex/foundation/state/kvstore/snapshot_test.go @@ -3,8 +3,8 @@ package kvstore_test import ( "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/stretchr/testify/require" ) diff --git a/spinifex/foundation/state/kvstore/store_test.go b/spinifex/foundation/state/kvstore/store_test.go index fdef3c674..b8cf68ac3 100644 --- a/spinifex/foundation/state/kvstore/store_test.go +++ b/spinifex/foundation/state/kvstore/store_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/foundation/state/kvutil/cas_conflict_test.go b/spinifex/foundation/state/kvutil/cas_conflict_test.go index 29b735d8b..038554285 100644 --- a/spinifex/foundation/state/kvutil/cas_conflict_test.go +++ b/spinifex/foundation/state/kvutil/cas_conflict_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/admin_accountquota_test.go b/spinifex/gateway/admin_accountquota_test.go index 8c5e2b5ef..6a14b7930 100644 --- a/spinifex/gateway/admin_accountquota_test.go +++ b/spinifex/gateway/admin_accountquota_test.go @@ -7,10 +7,10 @@ import ( "errors" "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/admin_createaccount.go b/spinifex/gateway/admin_createaccount.go index 156455c2e..23bbb75c7 100644 --- a/spinifex/gateway/admin_createaccount.go +++ b/spinifex/gateway/admin_createaccount.go @@ -13,8 +13,8 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/gateway/admin_createaccount_test.go b/spinifex/gateway/admin_createaccount_test.go index 4340d6317..e7621a8ef 100644 --- a/spinifex/gateway/admin_createaccount_test.go +++ b/spinifex/gateway/admin_createaccount_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/gateway/auth_test.go b/spinifex/gateway/auth_test.go index 2b35c1e8a..f10614c91 100644 --- a/spinifex/gateway/auth_test.go +++ b/spinifex/gateway/auth_test.go @@ -23,10 +23,10 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/go-chi/chi/v5" "github.com/mulgadc/bluebottle/pkg/sigv4" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_sts "github.com/mulgadc/spinifex/spinifex/handlers/sts" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/bedrock/access_test.go b/spinifex/gateway/bedrock/access_test.go index 5141db04a..f688e146a 100644 --- a/spinifex/gateway/bedrock/access_test.go +++ b/spinifex/gateway/bedrock/access_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/bedrock/credentials.go b/spinifex/gateway/bedrock/credentials.go index 897a0a810..9f6f992cc 100644 --- a/spinifex/gateway/bedrock/credentials.go +++ b/spinifex/gateway/bedrock/credentials.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/gateway/bedrock/credentials_test.go b/spinifex/gateway/bedrock/credentials_test.go index f0bb91435..031ef6c14 100644 --- a/spinifex/gateway/bedrock/credentials_test.go +++ b/spinifex/gateway/bedrock/credentials_test.go @@ -5,8 +5,8 @@ import ( "context" "testing" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrock/guardrail_test.go b/spinifex/gateway/bedrock/guardrail_test.go index f2f1e74bf..7d5d37f06 100644 --- a/spinifex/gateway/bedrock/guardrail_test.go +++ b/spinifex/gateway/bedrock/guardrail_test.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/bedrock" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrock/logging.go b/spinifex/gateway/bedrock/logging.go index 5e6d314be..2403b062d 100644 --- a/spinifex/gateway/bedrock/logging.go +++ b/spinifex/gateway/bedrock/logging.go @@ -15,8 +15,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/bedrock" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/foundation/state/clustersize" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/foundation/state/clustersize" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/gateway/bedrock/provisioned_test.go b/spinifex/gateway/bedrock/provisioned_test.go index 5aba55046..52bcfb04e 100644 --- a/spinifex/gateway/bedrock/provisioned_test.go +++ b/spinifex/gateway/bedrock/provisioned_test.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/bedrock" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrock_request_test.go b/spinifex/gateway/bedrock_request_test.go index e1b623432..3c737cbc0 100644 --- a/spinifex/gateway/bedrock_request_test.go +++ b/spinifex/gateway/bedrock_request_test.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go/service/bedrock" "github.com/aws/aws-sdk-go/service/bedrockruntime" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrockagent_request_test.go b/spinifex/gateway/bedrockagent_request_test.go index a38caff7d..f99d419b4 100644 --- a/spinifex/gateway/bedrockagent_request_test.go +++ b/spinifex/gateway/bedrockagent_request_test.go @@ -15,9 +15,9 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/bedrockagent" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrockagent_test.go b/spinifex/gateway/bedrockagent_test.go index afc8318da..56de8f2ad 100644 --- a/spinifex/gateway/bedrockagent_test.go +++ b/spinifex/gateway/bedrockagent_test.go @@ -17,9 +17,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/bedrockagent" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/bedrockagentruntime_request_test.go b/spinifex/gateway/bedrockagentruntime_request_test.go index e47c4fc63..5863971ad 100644 --- a/spinifex/gateway/bedrockagentruntime_request_test.go +++ b/spinifex/gateway/bedrockagentruntime_request_test.go @@ -15,9 +15,9 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/bedrockagentruntime" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ec2/authz.go b/spinifex/gateway/ec2/authz.go index 5cd74d2a9..24b8e3ec3 100644 --- a/spinifex/gateway/ec2/authz.go +++ b/spinifex/gateway/ec2/authz.go @@ -9,8 +9,8 @@ import ( "slices" "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" - "github.com/mulgadc/spinifex/spinifex/ingress/aws/query" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/ingress/aws/query" ) // The resource a policy check evaluates against when the request names nothing diff --git a/spinifex/gateway/ec2/authz_test.go b/spinifex/gateway/ec2/authz_test.go index a5cbf1330..85c9c5d2e 100644 --- a/spinifex/gateway/ec2/authz_test.go +++ b/spinifex/gateway/ec2/authz_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/ingress/aws/query" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/ingress/aws/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ec2/instance/RunInstances_test.go b/spinifex/gateway/ec2/instance/RunInstances_test.go index 288b4d6fe..337f82f4b 100644 --- a/spinifex/gateway/ec2/instance/RunInstances_test.go +++ b/spinifex/gateway/ec2/instance/RunInstances_test.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ec2/instance/clienttoken.go b/spinifex/gateway/ec2/instance/clienttoken.go index 9b249fd6d..271f96221 100644 --- a/spinifex/gateway/ec2/instance/clienttoken.go +++ b/spinifex/gateway/ec2/instance/clienttoken.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - gateway_ec2_idem "github.com/mulgadc/spinifex/spinifex/gateway/ec2/idem" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" + gateway_ec2_idem "github.com/mulgadc/spinifex/spinifex/gateway/ec2/idem" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/gateway/ec2/instance/clienttoken_test.go b/spinifex/gateway/ec2/instance/clienttoken_test.go index b3380813d..a88df8592 100644 --- a/spinifex/gateway/ec2/instance/clienttoken_test.go +++ b/spinifex/gateway/ec2/instance/clienttoken_test.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ec2/volume/DetachVolume_test.go b/spinifex/gateway/ec2/volume/DetachVolume_test.go index e2dde7351..d97991ed1 100644 --- a/spinifex/gateway/ec2/volume/DetachVolume_test.go +++ b/spinifex/gateway/ec2/volume/DetachVolume_test.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ec2_idempotency.go b/spinifex/gateway/ec2_idempotency.go index 43782d4a8..e7aa7b28a 100644 --- a/spinifex/gateway/ec2_idempotency.go +++ b/spinifex/gateway/ec2_idempotency.go @@ -8,8 +8,8 @@ import ( "net/http" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - gateway_ec2_idem "github.com/mulgadc/spinifex/spinifex/gateway/ec2/idem" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" + gateway_ec2_idem "github.com/mulgadc/spinifex/spinifex/gateway/ec2/idem" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/gateway/ec2_idempotency_test.go b/spinifex/gateway/ec2_idempotency_test.go index e55114847..14d22ab5a 100644 --- a/spinifex/gateway/ec2_idempotency_test.go +++ b/spinifex/gateway/ec2_idempotency_test.go @@ -17,9 +17,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecs/authz_test.go b/spinifex/gateway/ecs/authz_test.go index 4fa14b62d..7015dc1db 100644 --- a/spinifex/gateway/ecs/authz_test.go +++ b/spinifex/gateway/ecs/authz_test.go @@ -5,9 +5,9 @@ import ( "strconv" "testing" - "github.com/mulgadc/spinifex/spinifex/ingress/aws/query" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_ecs "github.com/mulgadc/spinifex/spinifex/gateway/ecs" + "github.com/mulgadc/spinifex/spinifex/ingress/aws/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecs/clienttoken_test.go b/spinifex/gateway/ecs/clienttoken_test.go index 86616b75a..ad77395ed 100644 --- a/spinifex/gateway/ecs/clienttoken_test.go +++ b/spinifex/gateway/ecs/clienttoken_test.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecs" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/eks/internal_authz_test.go b/spinifex/gateway/eks/internal_authz_test.go index d0085c301..35f9cc37a 100644 --- a/spinifex/gateway/eks/internal_authz_test.go +++ b/spinifex/gateway/eks/internal_authz_test.go @@ -3,10 +3,10 @@ package gateway_eks_test import ( "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_eks "github.com/mulgadc/spinifex/spinifex/gateway/eks" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/gateway/eks/internal_publish_test.go b/spinifex/gateway/eks/internal_publish_test.go index d6fc6a0dc..4309ebe09 100644 --- a/spinifex/gateway/eks/internal_publish_test.go +++ b/spinifex/gateway/eks/internal_publish_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/mulgadc/spinifex/internal/testkit" + handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/eks/token_review_test.go b/spinifex/gateway/eks/token_review_test.go index affc3225c..770d803db 100644 --- a/spinifex/gateway/eks/token_review_test.go +++ b/spinifex/gateway/eks/token_review_test.go @@ -6,9 +6,9 @@ import ( "encoding/json" "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/eks_authz_test.go b/spinifex/gateway/eks_authz_test.go index 98f0ea3bb..8c5b9c6e3 100644 --- a/spinifex/gateway/eks_authz_test.go +++ b/spinifex/gateway/eks_authz_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_eks "github.com/mulgadc/spinifex/spinifex/gateway/eks" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/elbv2/authz.go b/spinifex/gateway/elbv2/authz.go index 8662a8c56..3e5fe2b97 100644 --- a/spinifex/gateway/elbv2/authz.go +++ b/spinifex/gateway/elbv2/authz.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" - "github.com/mulgadc/spinifex/spinifex/ingress/aws/query" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/ingress/aws/query" ) // The resource a policy check evaluates against when the request names nothing diff --git a/spinifex/gateway/elbv2/dispatch_test.go b/spinifex/gateway/elbv2/dispatch_test.go index fccaa8eba..86a59e724 100644 --- a/spinifex/gateway/elbv2/dispatch_test.go +++ b/spinifex/gateway/elbv2/dispatch_test.go @@ -8,10 +8,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_elbv2 "github.com/mulgadc/spinifex/spinifex/gateway/elbv2" handlers_elbv2 "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/elbv2/listener_certs_test.go b/spinifex/gateway/elbv2/listener_certs_test.go index 5703c1a3a..13b2dcb51 100644 --- a/spinifex/gateway/elbv2/listener_certs_test.go +++ b/spinifex/gateway/elbv2/listener_certs_test.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/oidc_discovery_test.go b/spinifex/gateway/oidc_discovery_test.go index ad1d370ac..863d07ce5 100644 --- a/spinifex/gateway/oidc_discovery_test.go +++ b/spinifex/gateway/oidc_discovery_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/mulgadc/spinifex/internal/testkit" + handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" ) const ( diff --git a/spinifex/gateway/ratelimit_test.go b/spinifex/gateway/ratelimit_test.go index eabe0c0d4..fda16c6d3 100644 --- a/spinifex/gateway/ratelimit_test.go +++ b/spinifex/gateway/ratelimit_test.go @@ -12,9 +12,9 @@ import ( "time" "github.com/go-chi/chi/v5" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/rds/enginecatalog_test.go b/spinifex/gateway/rds/enginecatalog_test.go index 8e11b2acb..700675efc 100644 --- a/spinifex/gateway/rds/enginecatalog_test.go +++ b/spinifex/gateway/rds/enginecatalog_test.go @@ -13,9 +13,9 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/rds" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/rds/handler_test.go b/spinifex/gateway/rds/handler_test.go index 4ff0bac2c..f90d8bdce 100644 --- a/spinifex/gateway/rds/handler_test.go +++ b/spinifex/gateway/rds/handler_test.go @@ -12,9 +12,9 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/rds" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/rds_test.go b/spinifex/gateway/rds_test.go index 72692864b..b7d88117e 100644 --- a/spinifex/gateway/rds_test.go +++ b/spinifex/gateway/rds_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/spinifex_modelaccess_test.go b/spinifex/gateway/spinifex_modelaccess_test.go index b357fe423..031692ac0 100644 --- a/spinifex/gateway/spinifex_modelaccess_test.go +++ b/spinifex/gateway/spinifex_modelaccess_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/bedrock/launch_test.go b/spinifex/handlers/bedrock/launch_test.go index 53cea16e0..71231795e 100644 --- a/spinifex/handlers/bedrock/launch_test.go +++ b/spinifex/handlers/bedrock/launch_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/aws/aws-sdk-go/aws" - gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/bedrock/reaper.go b/spinifex/handlers/bedrock/reaper.go index 582ecf26e..b7947f6d4 100644 --- a/spinifex/handlers/bedrock/reaper.go +++ b/spinifex/handlers/bedrock/reaper.go @@ -7,10 +7,10 @@ import ( "log/slog" "time" - gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" + gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/handlers/bedrock/service_nats_test.go b/spinifex/handlers/bedrock/service_nats_test.go index dbae643e7..7dd4a5a42 100644 --- a/spinifex/handlers/bedrock/service_nats_test.go +++ b/spinifex/handlers/bedrock/service_nats_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/bedrock/store_test.go b/spinifex/handlers/bedrock/store_test.go index 2715a1c58..f136b63d8 100644 --- a/spinifex/handlers/bedrock/store_test.go +++ b/spinifex/handlers/bedrock/store_test.go @@ -3,8 +3,8 @@ package handlers_bedrock import ( "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/dns/reconcile_election_test.go b/spinifex/handlers/dns/reconcile_election_test.go index 1f7a7b757..9163d20df 100644 --- a/spinifex/handlers/dns/reconcile_election_test.go +++ b/spinifex/handlers/dns/reconcile_election_test.go @@ -6,8 +6,8 @@ package dns import ( "testing" - reconcilelock "github.com/mulgadc/spinifex/spinifex/network/reconcile" "github.com/mulgadc/spinifex/internal/testkit" + reconcilelock "github.com/mulgadc/spinifex/spinifex/network/reconcile" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/dns/reconcile_test.go b/spinifex/handlers/dns/reconcile_test.go index 432c48ddf..0bcf04612 100644 --- a/spinifex/handlers/dns/reconcile_test.go +++ b/spinifex/handlers/dns/reconcile_test.go @@ -7,10 +7,10 @@ import ( "time" nsconfig "github.com/mulgadc/northstar/pkg/config" + "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" reconcilelock "github.com/mulgadc/spinifex/spinifex/network/reconcile" - "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/eip/service_impl_test.go b/spinifex/handlers/ec2/eip/service_impl_test.go index 879e1ae1a..9b2b35340 100644 --- a/spinifex/handlers/ec2/eip/service_impl_test.go +++ b/spinifex/handlers/ec2/eip/service_impl_test.go @@ -8,10 +8,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/network/external" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/image/ami_source_volume_test.go b/spinifex/handlers/ec2/image/ami_source_volume_test.go index 95c36c132..fd741f164 100644 --- a/spinifex/handlers/ec2/image/ami_source_volume_test.go +++ b/spinifex/handlers/ec2/image/ami_source_volume_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/image/service_nats_test.go b/spinifex/handlers/ec2/image/service_nats_test.go index 589917edd..8053e9625 100644 --- a/spinifex/handlers/ec2/image/service_nats_test.go +++ b/spinifex/handlers/ec2/image/service_nats_test.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/instance/data_volumes_test.go b/spinifex/handlers/ec2/instance/data_volumes_test.go index d4e750d0f..417d73bbd 100644 --- a/spinifex/handlers/ec2/instance/data_volumes_test.go +++ b/spinifex/handlers/ec2/instance/data_volumes_test.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/providers/ebs" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/spotinstance/service_impl_test.go b/spinifex/handlers/ec2/spotinstance/service_impl_test.go index 5b9bd5dcb..69f78687c 100644 --- a/spinifex/handlers/ec2/spotinstance/service_impl_test.go +++ b/spinifex/handlers/ec2/spotinstance/service_impl_test.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/force_detach_test.go b/spinifex/handlers/ec2/volume/force_detach_test.go index c7e3a407a..d1cbc2560 100644 --- a/spinifex/handlers/ec2/volume/force_detach_test.go +++ b/spinifex/handlers/ec2/volume/force_detach_test.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go b/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go index e1f737096..db3f71366 100644 --- a/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go +++ b/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/vpc/eni_test.go b/spinifex/handlers/ec2/vpc/eni_test.go index 788ef2147..2628213d8 100644 --- a/spinifex/handlers/ec2/vpc/eni_test.go +++ b/spinifex/handlers/ec2/vpc/eni_test.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/vpc/external_ipam_test.go b/spinifex/handlers/ec2/vpc/external_ipam_test.go index c16cedc87..0ff4b40b2 100644 --- a/spinifex/handlers/ec2/vpc/external_ipam_test.go +++ b/spinifex/handlers/ec2/vpc/external_ipam_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/network/external" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ecs/capacity_test.go b/spinifex/handlers/ecs/capacity_test.go index 0f3a441fe..7743b0b47 100644 --- a/spinifex/handlers/ecs/capacity_test.go +++ b/spinifex/handlers/ecs/capacity_test.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ecs/revisit_test.go b/spinifex/handlers/ecs/revisit_test.go index eb762608d..73c395196 100644 --- a/spinifex/handlers/ecs/revisit_test.go +++ b/spinifex/handlers/ecs/revisit_test.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecs" - "github.com/mulgadc/spinifex/spinifex/handlers/ecs/bus" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" + "github.com/mulgadc/spinifex/spinifex/handlers/ecs/bus" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ecs/scheduler.go b/spinifex/handlers/ecs/scheduler.go index 088c017a8..91adf1d59 100644 --- a/spinifex/handlers/ecs/scheduler.go +++ b/spinifex/handlers/ecs/scheduler.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/mulgadc/spinifex/spinifex/handlers/ecs/bus" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" + "github.com/mulgadc/spinifex/spinifex/handlers/ecs/bus" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/ecs/service_test.go b/spinifex/handlers/ecs/service_test.go index e3f40c146..aa7f727c6 100644 --- a/spinifex/handlers/ecs/service_test.go +++ b/spinifex/handlers/ecs/service_test.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecs" - "github.com/mulgadc/spinifex/spinifex/handlers/ecs/bus" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/handlers/ecs/bus" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ecs/store.go b/spinifex/handlers/ecs/store.go index 46cc58aee..0e89cc744 100644 --- a/spinifex/handlers/ecs/store.go +++ b/spinifex/handlers/ecs/store.go @@ -6,9 +6,9 @@ import ( "fmt" "time" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/spinifex/foundation/state/migrate" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/eks/addon_status_reconciler_test.go b/spinifex/handlers/eks/addon_status_reconciler_test.go index c8abfe148..96158b633 100644 --- a/spinifex/handlers/eks/addon_status_reconciler_test.go +++ b/spinifex/handlers/eks/addon_status_reconciler_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/eks/addons_test.go b/spinifex/handlers/eks/addons_test.go index 076158413..c694dc813 100644 --- a/spinifex/handlers/eks/addons_test.go +++ b/spinifex/handlers/eks/addons_test.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/eks" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/clienttoken_test.go b/spinifex/handlers/eks/clienttoken_test.go index b84a9a9cd..62c154bcb 100644 --- a/spinifex/handlers/eks/clienttoken_test.go +++ b/spinifex/handlers/eks/clienttoken_test.go @@ -5,8 +5,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/eks" - handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/mulgadc/spinifex/internal/testkit" + handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/cluster_reconciler.go b/spinifex/handlers/eks/cluster_reconciler.go index c96d7ad0c..8270988bb 100644 --- a/spinifex/handlers/eks/cluster_reconciler.go +++ b/spinifex/handlers/eks/cluster_reconciler.go @@ -13,10 +13,10 @@ import ( "sync/atomic" "time" + "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" - "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/handlers/eks/cp_vpc.go b/spinifex/handlers/eks/cp_vpc.go index 2bb3e026d..6603801e1 100644 --- a/spinifex/handlers/eks/cp_vpc.go +++ b/spinifex/handlers/eks/cp_vpc.go @@ -3,8 +3,8 @@ package handlers_eks import ( "context" - handlers_systemvpc "github.com/mulgadc/spinifex/spinifex/handlers/systemvpc" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + handlers_systemvpc "github.com/mulgadc/spinifex/spinifex/handlers/systemvpc" ) // The managed control-plane VPC is the spinifex analogue of AWS EKS's hidden diff --git a/spinifex/handlers/eks/delete_cluster_test.go b/spinifex/handlers/eks/delete_cluster_test.go index cd7b6a42b..aadca6180 100644 --- a/spinifex/handlers/eks/delete_cluster_test.go +++ b/spinifex/handlers/eks/delete_cluster_test.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/eks" "github.com/aws/aws-sdk-go/service/elbv2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/eks/k3s_server_vm_test.go b/spinifex/handlers/eks/k3s_server_vm_test.go index 6ac2531be..8d2df4ab8 100644 --- a/spinifex/handlers/eks/k3s_server_vm_test.go +++ b/spinifex/handlers/eks/k3s_server_vm_test.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/nats_bootstrap_test.go b/spinifex/handlers/eks/nats_bootstrap_test.go index 2c32e39b9..86cb1ac4b 100644 --- a/spinifex/handlers/eks/nats_bootstrap_test.go +++ b/spinifex/handlers/eks/nats_bootstrap_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/eks/nlb.go b/spinifex/handlers/eks/nlb.go index 0d87ff507..09f531724 100644 --- a/spinifex/handlers/eks/nlb.go +++ b/spinifex/handlers/eks/nlb.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" ) // nlbProvisioner is the narrow ELBv2 surface needed by cluster NLB helpers. diff --git a/spinifex/handlers/eks/nlb_test.go b/spinifex/handlers/eks/nlb_test.go index 154453760..58a044b24 100644 --- a/spinifex/handlers/eks/nlb_test.go +++ b/spinifex/handlers/eks/nlb_test.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" - "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/nodegroup.go b/spinifex/handlers/eks/nodegroup.go index 0aa5844d9..d1656f899 100644 --- a/spinifex/handlers/eks/nodegroup.go +++ b/spinifex/handlers/eks/nodegroup.go @@ -21,10 +21,10 @@ import ( "github.com/aws/aws-sdk-go/service/eks" "github.com/aws/aws-sdk-go/service/iam" "github.com/mulgadc/bluebottle/pkg/auth" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/eks/nodegroup_test.go b/spinifex/handlers/eks/nodegroup_test.go index 54b4acf86..af7ebb307 100644 --- a/spinifex/handlers/eks/nodegroup_test.go +++ b/spinifex/handlers/eks/nodegroup_test.go @@ -15,11 +15,11 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/eks" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" - "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/recovery_directive_test.go b/spinifex/handlers/eks/recovery_directive_test.go index e868d4481..5ece88768 100644 --- a/spinifex/handlers/eks/recovery_directive_test.go +++ b/spinifex/handlers/eks/recovery_directive_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/service_impl_test.go b/spinifex/handlers/eks/service_impl_test.go index 956f193a4..b43f6f432 100644 --- a/spinifex/handlers/eks/service_impl_test.go +++ b/spinifex/handlers/eks/service_impl_test.go @@ -7,9 +7,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/eks" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/eks/store.go b/spinifex/handlers/eks/store.go index c8e2c1291..7cec17364 100644 --- a/spinifex/handlers/eks/store.go +++ b/spinifex/handlers/eks/store.go @@ -9,10 +9,10 @@ import ( "strings" "time" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/spinifex/foundation/state/migrate" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/eks/watch_source_test.go b/spinifex/handlers/eks/watch_source_test.go index 96662b2c7..41d55518d 100644 --- a/spinifex/handlers/eks/watch_source_test.go +++ b/spinifex/handlers/eks/watch_source_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" + handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/elbv2/health_checker_test.go b/spinifex/handlers/elbv2/health_checker_test.go index 424f1858d..bb7a3b4b9 100644 --- a/spinifex/handlers/elbv2/health_checker_test.go +++ b/spinifex/handlers/elbv2/health_checker_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/lbagent" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/lbagent" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/elbv2/service_impl_health_test.go b/spinifex/handlers/elbv2/service_impl_health_test.go index d07f00068..67fcba32c 100644 --- a/spinifex/handlers/elbv2/service_impl_health_test.go +++ b/spinifex/handlers/elbv2/service_impl_health_test.go @@ -7,9 +7,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/elbv2" + "github.com/mulgadc/spinifex/internal/testkit" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/elbv2/service_nats_e2e_test.go b/spinifex/handlers/elbv2/service_nats_e2e_test.go index 8e74ca824..743beb19c 100644 --- a/spinifex/handlers/elbv2/service_nats_e2e_test.go +++ b/spinifex/handlers/elbv2/service_nats_e2e_test.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/iam/account_lifecycle_test.go b/spinifex/handlers/iam/account_lifecycle_test.go index 26b118d54..192ee10e2 100644 --- a/spinifex/handlers/iam/account_lifecycle_test.go +++ b/spinifex/handlers/iam/account_lifecycle_test.go @@ -3,8 +3,8 @@ package handlers_iam_test import ( "testing" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/iam/account_names_test.go b/spinifex/handlers/iam/account_names_test.go index f36c091f6..42584a066 100644 --- a/spinifex/handlers/iam/account_names_test.go +++ b/spinifex/handlers/iam/account_names_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/iam/provision_test.go b/spinifex/handlers/iam/provision_test.go index 22887fa5b..a47bc76e2 100644 --- a/spinifex/handlers/iam/provision_test.go +++ b/spinifex/handlers/iam/provision_test.go @@ -5,8 +5,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/iam/service_impl_test.go b/spinifex/handlers/iam/service_impl_test.go index dcf5c5ae7..26b24e1b2 100644 --- a/spinifex/handlers/iam/service_impl_test.go +++ b/spinifex/handlers/iam/service_impl_test.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" "github.com/mulgadc/bluebottle/pkg/iampolicy" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/imds/metadata.go b/spinifex/handlers/imds/metadata.go index af26bac62..a61d51205 100644 --- a/spinifex/handlers/imds/metadata.go +++ b/spinifex/handlers/imds/metadata.go @@ -15,8 +15,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" + handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" ) const ( diff --git a/spinifex/handlers/imds/nats_clients_test.go b/spinifex/handlers/imds/nats_clients_test.go index 69fc8fe4a..f8641b774 100644 --- a/spinifex/handlers/imds/nats_clients_test.go +++ b/spinifex/handlers/imds/nats_clients_test.go @@ -10,11 +10,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" "github.com/aws/aws-sdk-go/service/sts" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_key "github.com/mulgadc/spinifex/spinifex/handlers/ec2/key" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_sts "github.com/mulgadc/spinifex/spinifex/handlers/sts" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/imds/service.go b/spinifex/handlers/imds/service.go index 3fb5b2329..d580ed8bb 100644 --- a/spinifex/handlers/imds/service.go +++ b/spinifex/handlers/imds/service.go @@ -10,9 +10,9 @@ import ( "time" "github.com/aws/aws-sdk-go/service/iam" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/ochrevector/api_test.go b/spinifex/handlers/ochrevector/api_test.go index 10734aaf8..a31785b5c 100644 --- a/spinifex/handlers/ochrevector/api_test.go +++ b/spinifex/handlers/ochrevector/api_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ochrevector/appliance.go b/spinifex/handlers/ochrevector/appliance.go index 24630b8f9..38f03e486 100644 --- a/spinifex/handlers/ochrevector/appliance.go +++ b/spinifex/handlers/ochrevector/appliance.go @@ -11,8 +11,8 @@ import ( "sync" "time" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/ochrevector/appliance_test.go b/spinifex/handlers/ochrevector/appliance_test.go index 7bc413bec..2dae1ae86 100644 --- a/spinifex/handlers/ochrevector/appliance_test.go +++ b/spinifex/handlers/ochrevector/appliance_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ochrevector/rds_launcher_test.go b/spinifex/handlers/ochrevector/rds_launcher_test.go index d38c8b929..586aae3a7 100644 --- a/spinifex/handlers/ochrevector/rds_launcher_test.go +++ b/spinifex/handlers/ochrevector/rds_launcher_test.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/rds" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/quota/bedrock_test.go b/spinifex/handlers/quota/bedrock_test.go index 6af343c2e..59dd64746 100644 --- a/spinifex/handlers/quota/bedrock_test.go +++ b/spinifex/handlers/quota/bedrock_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" toml "github.com/pelletier/go-toml/v2" diff --git a/spinifex/handlers/quota/enforce_test.go b/spinifex/handlers/quota/enforce_test.go index 39b4824c0..1d9f669ed 100644 --- a/spinifex/handlers/quota/enforce_test.go +++ b/spinifex/handlers/quota/enforce_test.go @@ -8,9 +8,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/elbv2" "github.com/aws/aws-sdk-go/service/rds" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/quota/records.go b/spinifex/handlers/quota/records.go index 082d5f299..34cd2b289 100644 --- a/spinifex/handlers/quota/records.go +++ b/spinifex/handlers/quota/records.go @@ -7,8 +7,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" + "github.com/mulgadc/spinifex/spinifex/utils" ) // InstanceVCPULister totals the vCPUs each account currently holds, in one diff --git a/spinifex/handlers/quota/records_test.go b/spinifex/handlers/quota/records_test.go index c1f42717a..471fc0d30 100644 --- a/spinifex/handlers/quota/records_test.go +++ b/spinifex/handlers/quota/records_test.go @@ -6,12 +6,12 @@ import ( "errors" "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" - handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/internal/testkit" - "github.com/mulgadc/spinifex/spinifex/utils" + "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" + "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/quota/vcpu.go b/spinifex/handlers/quota/vcpu.go index 936d38c42..b3f6e4a59 100644 --- a/spinifex/handlers/quota/vcpu.go +++ b/spinifex/handlers/quota/vcpu.go @@ -6,10 +6,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" - gateway_ec2_instance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/instance" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + gateway_ec2_instance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/instance" "github.com/nats-io/nats.go" ) diff --git a/spinifex/handlers/quota/vcpu_test.go b/spinifex/handlers/quota/vcpu_test.go index 540b9f7cf..75846056a 100644 --- a/spinifex/handlers/quota/vcpu_test.go +++ b/spinifex/handlers/quota/vcpu_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/rds/agent_test.go b/spinifex/handlers/rds/agent_test.go index ccf3f8217..72cd91ba9 100644 --- a/spinifex/handlers/rds/agent_test.go +++ b/spinifex/handlers/rds/agent_test.go @@ -16,8 +16,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/rds/bootstrap.go b/spinifex/handlers/rds/bootstrap.go index d1e8bb75d..aff5e780e 100644 --- a/spinifex/handlers/rds/bootstrap.go +++ b/spinifex/handlers/rds/bootstrap.go @@ -10,8 +10,8 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/handlers/rds/create.go b/spinifex/handlers/rds/create.go index 8b3dd9a40..9ecc338f1 100644 --- a/spinifex/handlers/rds/create.go +++ b/spinifex/handlers/rds/create.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" + "github.com/mulgadc/spinifex/spinifex/utils" ) // The first VM behind a DB instance. Replacement and recovery increment it, diff --git a/spinifex/handlers/rds/create_test.go b/spinifex/handlers/rds/create_test.go index a4c465c5e..c47706170 100644 --- a/spinifex/handlers/rds/create_test.go +++ b/spinifex/handlers/rds/create_test.go @@ -10,13 +10,13 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/rds" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" - "github.com/mulgadc/spinifex/internal/testkit" - "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" + "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/rds/delete.go b/spinifex/handlers/rds/delete.go index cade3c1ac..d4b410962 100644 --- a/spinifex/handlers/rds/delete.go +++ b/spinifex/handlers/rds/delete.go @@ -11,9 +11,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/handlers/rds/dns.go b/spinifex/handlers/rds/dns.go index 4e310a252..8dcfc4d1a 100644 --- a/spinifex/handlers/rds/dns.go +++ b/spinifex/handlers/rds/dns.go @@ -4,8 +4,8 @@ import ( "context" "log/slog" - handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" ) // The vanity hostname for a DB instance, or "" on a deployment with no base diff --git a/spinifex/handlers/rds/modify_test.go b/spinifex/handlers/rds/modify_test.go index e0036edbc..38d0d99d9 100644 --- a/spinifex/handlers/rds/modify_test.go +++ b/spinifex/handlers/rds/modify_test.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/rds" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/rds/paramcatalog.go b/spinifex/handlers/rds/paramcatalog.go index e68966b3f..5e9527f64 100644 --- a/spinifex/handlers/rds/paramcatalog.go +++ b/spinifex/handlers/rds/paramcatalog.go @@ -10,8 +10,8 @@ import ( "strings" "unicode" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" ) // The engine-neutral half of the parameter catalog: the spec type, its parsing diff --git a/spinifex/handlers/rds/reconciler.go b/spinifex/handlers/rds/reconciler.go index 7d2cccce5..960e6df6c 100644 --- a/spinifex/handlers/rds/reconciler.go +++ b/spinifex/handlers/rds/reconciler.go @@ -11,9 +11,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/rds/restore.go b/spinifex/handlers/rds/restore.go index 760e603b7..bdebfbf46 100644 --- a/spinifex/handlers/rds/restore.go +++ b/spinifex/handlers/rds/restore.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/handlers/rds/restore_test.go b/spinifex/handlers/rds/restore_test.go index 820495db5..a4a14a76c 100644 --- a/spinifex/handlers/rds/restore_test.go +++ b/spinifex/handlers/rds/restore_test.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" - "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" + "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/rds/sizing.go b/spinifex/handlers/rds/sizing.go index 9dd2477e5..7641184f4 100644 --- a/spinifex/handlers/rds/sizing.go +++ b/spinifex/handlers/rds/sizing.go @@ -5,8 +5,8 @@ import ( "maps" "slices" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" ) // db.* is a naming facade, not a second sizing table: every entry resolves diff --git a/spinifex/handlers/rds/sizing_test.go b/spinifex/handlers/rds/sizing_test.go index e5f42ec5d..059e43849 100644 --- a/spinifex/handlers/rds/sizing_test.go +++ b/spinifex/handlers/rds/sizing_test.go @@ -3,8 +3,8 @@ package handlers_rds import ( "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/rds/snapshot.go b/spinifex/handlers/rds/snapshot.go index a12bad91a..4ecc5a01c 100644 --- a/spinifex/handlers/rds/snapshot.go +++ b/spinifex/handlers/rds/snapshot.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/handlers/rds/snapshot_test.go b/spinifex/handlers/rds/snapshot_test.go index 627eb892e..2a9585099 100644 --- a/spinifex/handlers/rds/snapshot_test.go +++ b/spinifex/handlers/rds/snapshot_test.go @@ -8,10 +8,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/rds" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/tags" + iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/rds/store.go b/spinifex/handlers/rds/store.go index 01e4926c5..5475cdf98 100644 --- a/spinifex/handlers/rds/store.go +++ b/spinifex/handlers/rds/store.go @@ -11,10 +11,10 @@ import ( "strings" "time" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/spinifex/foundation/state/migrate" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/rds/watch_source_test.go b/spinifex/handlers/rds/watch_source_test.go index 4a211e4d3..113d8352d 100644 --- a/spinifex/handlers/rds/watch_source_test.go +++ b/spinifex/handlers/rds/watch_source_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" + handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/sts/assume_role_with_web_identity_test.go b/spinifex/handlers/sts/assume_role_with_web_identity_test.go index a9617ce76..64277ffbf 100644 --- a/spinifex/handlers/sts/assume_role_with_web_identity_test.go +++ b/spinifex/handlers/sts/assume_role_with_web_identity_test.go @@ -16,9 +16,9 @@ import ( "github.com/aws/aws-sdk-go/service/sts" "github.com/golang-jwt/jwt/v5" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/sts/oidc_jwks_test.go b/spinifex/handlers/sts/oidc_jwks_test.go index 6549eabb6..a14e9db8d 100644 --- a/spinifex/handlers/sts/oidc_jwks_test.go +++ b/spinifex/handlers/sts/oidc_jwks_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/mulgadc/spinifex/internal/testkit" + handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/sts/service_impl.go b/spinifex/handlers/sts/service_impl.go index 5edcb91ee..71f8600d1 100644 --- a/spinifex/handlers/sts/service_impl.go +++ b/spinifex/handlers/sts/service_impl.go @@ -6,8 +6,8 @@ import ( "fmt" "log/slog" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/sts/service_impl_test.go b/spinifex/handlers/sts/service_impl_test.go index 7914033a0..dcd25b3d1 100644 --- a/spinifex/handlers/sts/service_impl_test.go +++ b/spinifex/handlers/sts/service_impl_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/internal/testkit" + handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/network/external/dhcp/iface_mac_test.go b/spinifex/network/external/dhcp/iface_mac_test.go index 410178766..2cebfccda 100644 --- a/spinifex/network/external/dhcp/iface_mac_test.go +++ b/spinifex/network/external/dhcp/iface_mac_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/network/external/dhcp/kv_test.go b/spinifex/network/external/dhcp/kv_test.go index 412b7b0da..9377ffbcd 100644 --- a/spinifex/network/external/dhcp/kv_test.go +++ b/spinifex/network/external/dhcp/kv_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/network/external/dhcp/lrp_allocator_test.go b/spinifex/network/external/dhcp/lrp_allocator_test.go index 66bc81245..4b7b74c1e 100644 --- a/spinifex/network/external/dhcp/lrp_allocator_test.go +++ b/spinifex/network/external/dhcp/lrp_allocator_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/network/external/dhcp/manager_test.go b/spinifex/network/external/dhcp/manager_test.go index 219f3837e..a450713df 100644 --- a/spinifex/network/external/dhcp/manager_test.go +++ b/spinifex/network/external/dhcp/manager_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/network/external/dhcp/pool_allocator_test.go b/spinifex/network/external/dhcp/pool_allocator_test.go index cfb0a13a4..8aff2e783 100644 --- a/spinifex/network/external/dhcp/pool_allocator_test.go +++ b/spinifex/network/external/dhcp/pool_allocator_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/network/external/ocinet/affinity_test.go b/spinifex/network/external/ocinet/affinity_test.go index 4709505bf..d474fc424 100644 --- a/spinifex/network/external/ocinet/affinity_test.go +++ b/spinifex/network/external/ocinet/affinity_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/ocinet" + "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" ) const ( diff --git a/spinifex/network/external/ocinet/allocator.go b/spinifex/network/external/ocinet/allocator.go index eafa01a8b..9b2f14d5c 100644 --- a/spinifex/network/external/ocinet/allocator.go +++ b/spinifex/network/external/ocinet/allocator.go @@ -32,9 +32,9 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/network/external" + "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" ) // DisplayNamePrefix marks every OCI object this package creates. Reconcile only diff --git a/spinifex/network/external/ocinet/allocator_test.go b/spinifex/network/external/ocinet/allocator_test.go index be3a243f8..f991f223a 100644 --- a/spinifex/network/external/ocinet/allocator_test.go +++ b/spinifex/network/external/ocinet/allocator_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/require" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/ocinet" + "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" ) // newTestAllocator wires a fake OCI and an in-memory store, with a poll ladder diff --git a/spinifex/network/external/ocinet/owner_test.go b/spinifex/network/external/ocinet/owner_test.go index 95c62c50c..c6204cc84 100644 --- a/spinifex/network/external/ocinet/owner_test.go +++ b/spinifex/network/external/ocinet/owner_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/ocinet" + "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" ) // allocateBare is an EIP as AWS makes one: an address with no interface behind diff --git a/spinifex/network/external/ocinet/reconcile.go b/spinifex/network/external/ocinet/reconcile.go index cc94b21c5..488955362 100644 --- a/spinifex/network/external/ocinet/reconcile.go +++ b/spinifex/network/external/ocinet/reconcile.go @@ -7,8 +7,8 @@ import ( "log/slog" "strings" - "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" ) // ReconcileResult reports what a pass found, so a caller can log it and a test diff --git a/spinifex/network/external/ocinet/reconcile_test.go b/spinifex/network/external/ocinet/reconcile_test.go index 5f1959800..77562d8cc 100644 --- a/spinifex/network/external/ocinet/reconcile_test.go +++ b/spinifex/network/external/ocinet/reconcile_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/ocinet" + "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" ) // A crash between creating the OCI objects and writing the binding leaves a diff --git a/spinifex/network/external/ocinet/wiring.go b/spinifex/network/external/ocinet/wiring.go index 9751d0036..0bf0cf697 100644 --- a/spinifex/network/external/ocinet/wiring.go +++ b/spinifex/network/external/ocinet/wiring.go @@ -7,10 +7,10 @@ import ( "github.com/nats-io/nats.go/jetstream" - "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/host" "github.com/mulgadc/spinifex/spinifex/network/topology" + "github.com/mulgadc/spinifex/spinifex/providers/cloud/oci" ) // FromPoolConfig builds a live allocator for one source="oci" pool: API-key diff --git a/spinifex/network/external/static_pool_test.go b/spinifex/network/external/static_pool_test.go index 5f0c96220..1d4df22a7 100644 --- a/spinifex/network/external/static_pool_test.go +++ b/spinifex/network/external/static_pool_test.go @@ -6,8 +6,8 @@ import ( "sync" "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/network/reconcile/drift.go b/spinifex/network/reconcile/drift.go index bd42fd789..bc9888cb8 100644 --- a/spinifex/network/reconcile/drift.go +++ b/spinifex/network/reconcile/drift.go @@ -7,14 +7,14 @@ import ( "log/slog" "time" + loop "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" handlers_ec2_eip "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eip" handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw" handlers_ec2_natgw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/natgw" handlers_ec2_routetable "github.com/mulgadc/spinifex/spinifex/handlers/ec2/routetable" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" - loop "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/network/reconcile/drift_watch_test.go b/spinifex/network/reconcile/drift_watch_test.go index 9bbde2b64..9c9299cf2 100644 --- a/spinifex/network/reconcile/drift_watch_test.go +++ b/spinifex/network/reconcile/drift_watch_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/network/reconcile/intent.go b/spinifex/network/reconcile/intent.go index 99fa6cf35..58bdf45f4 100644 --- a/spinifex/network/reconcile/intent.go +++ b/spinifex/network/reconcile/intent.go @@ -11,12 +11,12 @@ import ( "slices" "strings" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" handlers_ec2_eip "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eip" handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw" handlers_ec2_natgw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/natgw" handlers_ec2_routetable "github.com/mulgadc/spinifex/spinifex/handlers/ec2/routetable" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" diff --git a/spinifex/network/reconcile/intent_test.go b/spinifex/network/reconcile/intent_test.go index aae4b4358..bcdf97ad9 100644 --- a/spinifex/network/reconcile/intent_test.go +++ b/spinifex/network/reconcile/intent_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" handlers_ec2_eip "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eip" handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw" handlers_ec2_natgw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/natgw" handlers_ec2_routetable "github.com/mulgadc/spinifex/spinifex/handlers/ec2/routetable" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/network/policy" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/network/reconcile/scenario_kv_live_test.go b/spinifex/network/reconcile/scenario_kv_live_test.go index f988b7e0d..0bbb18ef4 100644 --- a/spinifex/network/reconcile/scenario_kv_live_test.go +++ b/spinifex/network/reconcile/scenario_kv_live_test.go @@ -10,8 +10,8 @@ import ( "encoding/json" "testing" - vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" + vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/network/subscribers/subscribers_test.go b/spinifex/network/subscribers/subscribers_test.go index 7cc9abc6d..cc921902b 100644 --- a/spinifex/network/subscribers/subscribers_test.go +++ b/spinifex/network/subscribers/subscribers_test.go @@ -12,12 +12,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/internal/testkit" ) const requestTimeout = 2 * time.Second diff --git a/spinifex/runtime/compute/cache/cache.go b/spinifex/runtime/compute/cache/cache.go index fb00e2a38..8ceb357ef 100644 --- a/spinifex/runtime/compute/cache/cache.go +++ b/spinifex/runtime/compute/cache/cache.go @@ -129,9 +129,11 @@ type Cache struct { // until the first sync completes, List reports the cache not ready. func New(js jetstream.JetStream, cfg Config) *Cache { if cfg.VisibleToCaller == nil { + //nolint:forbidigo // A missing policy field is a composition-root wiring error, not a runtime fault. panic("instancecache: Config.VisibleToCaller is required") } if cfg.FallbackAccountID == "" { + //nolint:forbidigo // A missing policy field is a composition-root wiring error, not a runtime fault. panic("instancecache: Config.FallbackAccountID is required") } diff --git a/spinifex/runtime/service/service.go b/spinifex/runtime/service/service.go index 9ba713b0b..431a3e2d7 100644 --- a/spinifex/runtime/service/service.go +++ b/spinifex/runtime/service/service.go @@ -3,14 +3,14 @@ package service import ( "fmt" - "github.com/mulgadc/spinifex/spinifex/services/awsgw" "github.com/mulgadc/spinifex/spinifex/runtime/roles/nats" - "github.com/mulgadc/spinifex/spinifex/services/northstar" - "github.com/mulgadc/spinifex/spinifex/services/predastore" "github.com/mulgadc/spinifex/spinifex/runtime/roles/qemunbdd" "github.com/mulgadc/spinifex/spinifex/runtime/roles/qmpcollector" "github.com/mulgadc/spinifex/spinifex/runtime/roles/spinifex" "github.com/mulgadc/spinifex/spinifex/runtime/roles/spinifexui" + "github.com/mulgadc/spinifex/spinifex/services/awsgw" + "github.com/mulgadc/spinifex/spinifex/services/northstar" + "github.com/mulgadc/spinifex/spinifex/services/predastore" "github.com/mulgadc/spinifex/spinifex/services/viperblockd" "github.com/mulgadc/spinifex/spinifex/vpcd" ) diff --git a/spinifex/services/awsgw/eks_token_verify_test.go b/spinifex/services/awsgw/eks_token_verify_test.go index f3b138b3c..512b60781 100644 --- a/spinifex/services/awsgw/eks_token_verify_test.go +++ b/spinifex/services/awsgw/eks_token_verify_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" handlers_sts "github.com/mulgadc/spinifex/spinifex/handlers/sts" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/services/awsgw/quota_reconcile_test.go b/spinifex/services/awsgw/quota_reconcile_test.go index c9158d1ef..0a8a80ebe 100644 --- a/spinifex/services/awsgw/quota_reconcile_test.go +++ b/spinifex/services/awsgw/quota_reconcile_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/require" diff --git a/spinifex/services/viperblockd/provider_tracing_test.go b/spinifex/services/viperblockd/provider_tracing_test.go index 2b17ae67f..f00d57c8f 100644 --- a/spinifex/services/viperblockd/provider_tracing_test.go +++ b/spinifex/services/viperblockd/provider_tracing_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/codes" diff --git a/spinifex/utils/nats_test.go b/spinifex/utils/nats_test.go index 4c5a266b9..69398ecf3 100644 --- a/spinifex/utils/nats_test.go +++ b/spinifex/utils/nats_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/vpcd/host_eip_loop.go b/spinifex/vpcd/host_eip_loop.go index 42dc8ccfd..b7d112465 100644 --- a/spinifex/vpcd/host_eip_loop.go +++ b/spinifex/vpcd/host_eip_loop.go @@ -5,8 +5,8 @@ import ( "log/slog" "time" - "github.com/mulgadc/spinifex/spinifex/network/reconcile" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" + "github.com/mulgadc/spinifex/spinifex/network/reconcile" ) // Host EIP pass cadence. Shorter than the drift interval because the state it diff --git a/spinifex/vpcd/lease_datapath_reconcile_test.go b/spinifex/vpcd/lease_datapath_reconcile_test.go index 7f445eed2..9eea2f465 100644 --- a/spinifex/vpcd/lease_datapath_reconcile_test.go +++ b/spinifex/vpcd/lease_datapath_reconcile_test.go @@ -5,11 +5,11 @@ import ( "net" "testing" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/vpcd/lease_ip_change_test.go b/spinifex/vpcd/lease_ip_change_test.go index c82f384f3..17d557816 100644 --- a/spinifex/vpcd/lease_ip_change_test.go +++ b/spinifex/vpcd/lease_ip_change_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/vpcd/lease_reaper_test.go b/spinifex/vpcd/lease_reaper_test.go index 38b93a134..322c8903a 100644 --- a/spinifex/vpcd/lease_reaper_test.go +++ b/spinifex/vpcd/lease_reaper_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/vpcd/ovn_controller_watchdog.go b/spinifex/vpcd/ovn_controller_watchdog.go index 530796610..e38d03d86 100644 --- a/spinifex/vpcd/ovn_controller_watchdog.go +++ b/spinifex/vpcd/ovn_controller_watchdog.go @@ -5,8 +5,8 @@ import ( "log/slog" "time" - "github.com/mulgadc/spinifex/spinifex/network/host" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" + "github.com/mulgadc/spinifex/spinifex/network/host" ) // Compile-time check: the gateway-claim prober satisfies the watchdog's needs.