Skip to content

Commit

Permalink
rename things
Browse files Browse the repository at this point in the history
  • Loading branch information
@raphaelvigee
raphaelvigee committed Dec 29, 2024
1 parent e980e78 commit ecc244d
Show file tree
Hide file tree
Showing 60 changed files with 151 additions and 167 deletions.
0 .idea/hephv2.iml → .idea/heph.iml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/hephbuild/hephv2
module github.com/hephbuild/heph

go 1.23.0

Expand All @@ -15,7 +15,6 @@ require (
github.com/go-faker/faker/v4 v4.5.0
github.com/go-viper/mapstructure/v2 v2.2.1
github.com/google/uuid v1.6.0
github.com/hephbuild/heph v0.0.0-20241014152409-5a0513b6be30
github.com/mattn/go-isatty v0.0.20
github.com/muesli/termenv v0.15.2
github.com/shirou/gopsutil/v3 v3.24.5
Expand All @@ -38,7 +37,6 @@ require (
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
Expand All @@ -48,13 +46,11 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.9.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
14 changes: 1 addition & 13 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a/go.mod
github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.20 h1:VIPb/a2s17qNeQgDnkfZC35RScx+blkKF8GV68n80J4=
github.com/creack/pty v1.1.20/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -36,16 +35,10 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hephbuild/heph v0.0.0-20241014152409-5a0513b6be30 h1:Mr6mVa5qc23mhZPbClbavpvfuUeNAsUKtGLv10l8suM=
github.com/hephbuild/heph v0.0.0-20241014152409-5a0513b6be30/go.mod h1:V2inYf1ohqmoHd7y9rJKgaagJ6MHBWNXRy/feT4hHGo=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
Expand All @@ -71,8 +64,6 @@ github.com/raphaelvigee/bubbletea v0.0.0-20241227212548-ff79c9f0edc9/go.mod h1:Q
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
Expand Down Expand Up @@ -102,8 +93,6 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
go.starlark.net v0.0.0-20241226192728-8dfa5b98479f h1:Zs/py28HDFATSDzPcfIzrBFjVsV7HzDEGNNVZIGsjm0=
go.starlark.net v0.0.0-20241226192728-8dfa5b98479f/go.mod h1:YKMCv9b1WrfWmeqdV5MAuEHWsu5iC+fe6kYl2sQjdI8=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
Expand All @@ -122,9 +111,8 @@ golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2 changes: 1 addition & 1 deletion internal/cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"runtime/pprof"
"sync"

"github.com/hephbuild/hephv2/internal/hcore/hlog"
"github.com/hephbuild/heph/internal/hcore/hlog"
"github.com/mattn/go-isatty"
"github.com/spf13/cobra"
)
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"os"

tea "github.com/charmbracelet/bubbletea"
"github.com/hephbuild/hephv2/internal/engine"
"github.com/hephbuild/hephv2/internal/hbbt/hbbtexec"
"github.com/hephbuild/hephv2/internal/hfs"
"github.com/hephbuild/hephv2/internal/termui"
"github.com/hephbuild/hephv2/plugin/pluginbuildfile"
"github.com/hephbuild/hephv2/plugin/pluginexec"
"github.com/hephbuild/heph/internal/engine"
"github.com/hephbuild/heph/internal/hbbt/hbbtexec"
"github.com/hephbuild/heph/internal/hfs"
"github.com/hephbuild/heph/internal/termui"
"github.com/hephbuild/heph/plugin/pluginbuildfile"
"github.com/hephbuild/heph/plugin/pluginexec"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions internal/engine/engine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"path/filepath"
"strings"

"github.com/hephbuild/hephv2/internal/hcore/hlog"
"github.com/hephbuild/hephv2/internal/hcore/hstep"
"github.com/hephbuild/hephv2/internal/hfs"
"github.com/hephbuild/hephv2/plugin/gen/heph/core/v1/corev1connect"
"github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1/pluginv1connect"
"github.com/hephbuild/heph/internal/hcore/hlog"
"github.com/hephbuild/heph/internal/hcore/hstep"
"github.com/hephbuild/heph/internal/hfs"
"github.com/hephbuild/heph/plugin/gen/heph/core/v1/corev1connect"
"github.com/hephbuild/heph/plugin/gen/heph/plugin/v1/pluginv1connect"
)

func Root() (string, error) {
Expand Down
6 changes: 3 additions & 3 deletions internal/engine/link.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"slices"

"connectrpc.com/connect"
"github.com/hephbuild/hephv2/internal/hcore/hstep"
"github.com/hephbuild/hephv2/internal/hmaps"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/internal/hcore/hstep"
"github.com/hephbuild/heph/internal/hmaps"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
)

func (e *Engine) GetSpec(ctx context.Context, pkg, name string) (*pluginv1.TargetSpec, error) {
Expand Down
10 changes: 5 additions & 5 deletions internal/engine/local_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"os"
"time"

"github.com/hephbuild/hephv2/internal/hartifact"
"github.com/hephbuild/hephv2/internal/hcore/hlog"
"github.com/hephbuild/hephv2/internal/hfs"
"github.com/hephbuild/hephv2/internal/hlocks"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/internal/hartifact"
"github.com/hephbuild/heph/internal/hcore/hlog"
"github.com/hephbuild/heph/internal/hfs"
"github.com/hephbuild/heph/internal/hlocks"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
"github.com/zeebo/xxh3"
"google.golang.org/protobuf/proto"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/manifest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package engine
import (
"time"

pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
)

var ArtifactManifestName = "manifest.v1.json"
Expand Down
8 changes: 4 additions & 4 deletions internal/engine/plugins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"time"

"connectrpc.com/connect"
"github.com/hephbuild/hephv2/internal/hcore"
"github.com/hephbuild/hephv2/internal/hcore/hstep/hstepconnect"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1/pluginv1connect"
"github.com/hephbuild/heph/internal/hcore"
"github.com/hephbuild/heph/internal/hcore/hstep/hstepconnect"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/plugin/gen/heph/plugin/v1/pluginv1connect"
"golang.org/x/net/http2"
"golang.org/x/net/http2/h2c"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/engine/sandbox.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"fmt"

"github.com/hephbuild/hephv2/internal/hartifact"
"github.com/hephbuild/hephv2/internal/hfs"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/internal/hartifact"
"github.com/hephbuild/heph/internal/hfs"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
)

func SetupSandbox(ctx context.Context, depResults []*ExecuteResultWithOrigin, fs hfs.FS) ([]*pluginv1.ArtifactWithOrigin, error) {
Expand Down
20 changes: 10 additions & 10 deletions internal/engine/schedule.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ import (

"connectrpc.com/connect"
"github.com/dlsniper/debugger"
"github.com/hephbuild/hephv2/internal/hcore/hlog"
"github.com/hephbuild/hephv2/internal/hcore/hstep"
"github.com/hephbuild/hephv2/internal/hfs"
"github.com/hephbuild/hephv2/internal/hinstance"
"github.com/hephbuild/hephv2/internal/hlocks"
"github.com/hephbuild/hephv2/internal/hpty"
"github.com/hephbuild/hephv2/internal/htar"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1/pluginv1connect"
"github.com/hephbuild/hephv2/plugin/hpipe"
"github.com/hephbuild/heph/internal/hcore/hlog"
"github.com/hephbuild/heph/internal/hcore/hstep"
"github.com/hephbuild/heph/internal/hfs"
"github.com/hephbuild/heph/internal/hinstance"
"github.com/hephbuild/heph/internal/hlocks"
"github.com/hephbuild/heph/internal/hpty"
"github.com/hephbuild/heph/internal/htar"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/plugin/gen/heph/plugin/v1/pluginv1connect"
"github.com/hephbuild/heph/plugin/hpipe"
"github.com/zeebo/xxh3"
"golang.org/x/sync/errgroup"
"google.golang.org/protobuf/proto"
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/singleflight.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"slices"
"sync"

"github.com/hephbuild/hephv2/internal/hproto"
"github.com/hephbuild/heph/internal/hproto"
)

type Singleflight struct {
Expand Down
14 changes: 7 additions & 7 deletions internal/enginee2e/deps_cache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"os"
"testing"

"github.com/hephbuild/hephv2/internal/engine"
"github.com/hephbuild/hephv2/internal/hartifact"
"github.com/hephbuild/hephv2/internal/hfs"
"github.com/hephbuild/hephv2/internal/hfs/hfstest"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/hephv2/plugin/pluginexec"
"github.com/hephbuild/hephv2/plugin/pluginstaticprovider"
"github.com/hephbuild/heph/internal/engine"
"github.com/hephbuild/heph/internal/hartifact"
"github.com/hephbuild/heph/internal/hfs"
"github.com/hephbuild/heph/internal/hfs/hfstest"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/plugin/pluginexec"
"github.com/hephbuild/heph/plugin/pluginstaticprovider"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
8 changes: 4 additions & 4 deletions internal/enginee2e/env_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"os"
"testing"

"github.com/hephbuild/hephv2/internal/engine"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/hephv2/plugin/pluginexec"
"github.com/hephbuild/hephv2/plugin/pluginstaticprovider"
"github.com/hephbuild/heph/internal/engine"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/plugin/pluginexec"
"github.com/hephbuild/heph/plugin/pluginstaticprovider"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
14 changes: 7 additions & 7 deletions internal/enginee2e/sanity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"os"
"testing"

"github.com/hephbuild/hephv2/internal/engine"
"github.com/hephbuild/hephv2/internal/hartifact"
"github.com/hephbuild/hephv2/internal/hfs"
"github.com/hephbuild/hephv2/internal/hfs/hfstest"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/hephv2/plugin/pluginexec"
"github.com/hephbuild/hephv2/plugin/pluginstaticprovider"
"github.com/hephbuild/heph/internal/engine"
"github.com/hephbuild/heph/internal/hartifact"
"github.com/hephbuild/heph/internal/hfs"
"github.com/hephbuild/heph/internal/hfs/hfstest"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/plugin/pluginexec"
"github.com/hephbuild/heph/plugin/pluginstaticprovider"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
6 changes: 3 additions & 3 deletions internal/experiment/teaexecprintln/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"time"

tea "github.com/charmbracelet/bubbletea"
"github.com/hephbuild/hephv2/internal/hbbt/hbbtexec"
"github.com/hephbuild/hephv2/internal/hbbt/hbbtlog"
"github.com/hephbuild/hephv2/internal/hcore/hlog"
"github.com/hephbuild/heph/internal/hbbt/hbbtexec"
"github.com/hephbuild/heph/internal/hbbt/hbbtlog"
"github.com/hephbuild/heph/internal/hcore/hlog"
)

// When exec is running, its blocking the event loop
Expand Down
4 changes: 2 additions & 2 deletions internal/hartifact/reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"io"

"github.com/hephbuild/hephv2/internal/hfs"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/internal/hfs"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
)

func Reader(ctx context.Context, a *pluginv1.Artifact) (io.ReadCloser, error) {
Expand Down
6 changes: 3 additions & 3 deletions internal/hartifact/unpack.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"io"

"github.com/hephbuild/hephv2/internal/hfs"
"github.com/hephbuild/hephv2/internal/htar"
pluginv1 "github.com/hephbuild/hephv2/plugin/gen/heph/plugin/v1"
"github.com/hephbuild/heph/internal/hfs"
"github.com/hephbuild/heph/internal/htar"
pluginv1 "github.com/hephbuild/heph/plugin/gen/heph/plugin/v1"
)

type unpackConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/hbbt/hbbtexec/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/x/term"
"github.com/hephbuild/hephv2/internal/hbbt/hbbtlog"
"github.com/hephbuild/heph/internal/hbbt/hbbtlog"
)

type ExecFunc[T any] func(args RunArgs) (T, error)
Expand Down
4 changes: 2 additions & 2 deletions internal/hbbt/hbbtlog/log_hijacker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync/atomic"

tea "github.com/charmbracelet/bubbletea"
"github.com/hephbuild/hephv2/internal/hbbt/hbbtch"
"github.com/hephbuild/hephv2/internal/hcore/hlog"
"github.com/hephbuild/heph/internal/hbbt/hbbtch"
"github.com/hephbuild/heph/internal/hcore/hlog"
)

type Hijacker struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/hcore/hlog/hlogtest/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log/slog"
"testing"

"github.com/hephbuild/hephv2/internal/hcore/hlog"
"github.com/hephbuild/heph/internal/hcore/hlog"
)

func NewLogger(t testing.TB) hlog.Logger {
Expand Down
4 changes: 2 additions & 2 deletions internal/hcore/hlog/rpc_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"log/slog"

"connectrpc.com/connect"
corev1 "github.com/hephbuild/hephv2/plugin/gen/heph/core/v1"
"github.com/hephbuild/hephv2/plugin/gen/heph/core/v1/corev1connect"
corev1 "github.com/hephbuild/heph/plugin/gen/heph/core/v1"
"github.com/hephbuild/heph/plugin/gen/heph/core/v1/corev1connect"
)

type rpcHandler struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/hcore/hlog/slog_handler_rpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sync"

"connectrpc.com/connect"
corev1 "github.com/hephbuild/hephv2/plugin/gen/heph/core/v1"
"github.com/hephbuild/hephv2/plugin/gen/heph/core/v1/corev1connect"
corev1 "github.com/hephbuild/heph/plugin/gen/heph/core/v1"
"github.com/hephbuild/heph/plugin/gen/heph/core/v1/corev1connect"
)

type slogRPCHandler struct {
Expand Down
Loading

0 comments on commit ecc244d

Please sign in to comment.