diff --git a/internal/autoscaler/protos/externalgrpc.pb.go b/internal/autoscaler/protos/externalgrpc.pb.go index 6bc0ceb36..efb7c52bf 100644 --- a/internal/autoscaler/protos/externalgrpc.pb.go +++ b/internal/autoscaler/protos/externalgrpc.pb.go @@ -19,6 +19,8 @@ // protoc v3.21.12 // source: cloudprovider/externalgrpc/protos/externalgrpc.proto +//lint:file-ignore SA1019 Generated protobuf compatibility shims may reference deprecated APIs. + package protos import ( diff --git a/internal/repositories/libvirt/adapter.go b/internal/repositories/libvirt/adapter.go index c4eb4c943..9bf54bea0 100644 --- a/internal/repositories/libvirt/adapter.go +++ b/internal/repositories/libvirt/adapter.go @@ -22,10 +22,22 @@ import ( "time" "github.com/digitalocean/go-libvirt" + libvirtsocket "github.com/digitalocean/go-libvirt/socket" "github.com/google/uuid" "github.com/poyrazk/thecloud/internal/core/ports" ) +type libvirtUnixDialer struct { + uri string + timeout time.Duration +} + +var _ libvirtsocket.Dialer = (*libvirtUnixDialer)(nil) + +func (d *libvirtUnixDialer) Dial() (net.Conn, error) { + return net.DialTimeout("unix", d.uri, d.timeout) +} + const ( defaultPoolName = "default" userDataFileName = "user-data" @@ -110,8 +122,8 @@ func NewLibvirtAdapter(logger *slog.Logger, uri string) (*LibvirtAdapter, error) } } - //nolint:staticcheck - l := libvirt.New(c) + _ = c.Close() + l := libvirt.NewWithDialer(&libvirtUnixDialer{uri: uri, timeout: 2 * time.Second}) adapter := &LibvirtAdapter{ client: &RealLibvirtClient{conn: l}, logger: logger, diff --git a/internal/repositories/postgres/execution_ledger.go b/internal/repositories/postgres/execution_ledger.go index 24f3e401b..19dc13a90 100644 --- a/internal/repositories/postgres/execution_ledger.go +++ b/internal/repositories/postgres/execution_ledger.go @@ -127,8 +127,7 @@ func (l *PgExecutionLedger) MarkFailed(ctx context.Context, jobKey string, reaso // GetStatus returns the current status, result and start time of a job. func (l *PgExecutionLedger) GetStatus(ctx context.Context, jobKey string) (status string, result string, startedAt time.Time, err error) { - var res pgx.Row - res = l.db.QueryRow(ctx, ` + res := l.db.QueryRow(ctx, ` SELECT status, COALESCE(result, ''), started_at FROM job_executions WHERE job_key = $1 `, jobKey)