Skip to content

Adopt env package from toolhive-core #3572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChrisJBurns merged 1 commit into from
Feb 4, 2026
Merged

Adopt env package from toolhive-core #3572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/vmcp/app/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"go.opentelemetry.io/otel/trace"
"k8s.io/client-go/rest"

"github.com/stacklok/toolhive-core/env"
"github.com/stacklok/toolhive/pkg/audit"
"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive/pkg/groups"
"github.com/stacklok/toolhive/pkg/logger"
"github.com/stacklok/toolhive/pkg/telemetry"
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/adrg/xdg"
"gopkg.in/yaml.v3"

"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive-core/env"
"github.com/stacklok/toolhive/pkg/lockfile"
"github.com/stacklok/toolhive/pkg/logger"
"github.com/stacklok/toolhive/pkg/secrets"
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"go.uber.org/mock/gomock"
"gopkg.in/yaml.v3"

"github.com/stacklok/toolhive/pkg/env/mocks"
"github.com/stacklok/toolhive-core/env/mocks"
"github.com/stacklok/toolhive/pkg/logger"
"github.com/stacklok/toolhive/pkg/secrets"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/container/runtime/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"strings"
"time"

"github.com/stacklok/toolhive-core/env"
"github.com/stacklok/toolhive-core/httperr"
"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive/pkg/ignore"
"github.com/stacklok/toolhive/pkg/permissions"
)
Expand Down
23 changes: 0 additions & 23 deletions pkg/env/env.go
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions pkg/env/env_test.go
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions pkg/env/mocks/mock_reader.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/logger/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"go.uber.org/zap"
"go.uber.org/zap/zapcore"

"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive-core/env"
)

// Debug logs a message at debug level using the singleton logger.
Expand Down
2 changes: 1 addition & 1 deletion pkg/logger/logger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

"github.com/stacklok/toolhive/pkg/env/mocks"
"github.com/stacklok/toolhive-core/env/mocks"
)

// TestUnstructuredLogsCheck tests the unstructuredLogs function
Expand Down
2 changes: 1 addition & 1 deletion pkg/usagemetrics/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"runtime"
"time"

"github.com/stacklok/toolhive-core/env"
rt "github.com/stacklok/toolhive/pkg/container/runtime"
"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive/pkg/logger"
"github.com/stacklok/toolhive/pkg/updates"
"github.com/stacklok/toolhive/pkg/versions"
Expand Down
2 changes: 1 addition & 1 deletion pkg/usagemetrics/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"

envmocks "github.com/stacklok/toolhive/pkg/env/mocks"
envmocks "github.com/stacklok/toolhive-core/env/mocks"
)

// newTestClient creates a client for testing with a pre-set anonymous ID
Expand Down
2 changes: 1 addition & 1 deletion pkg/vmcp/auth/factory/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/stacklok/toolhive-core/env"
mcpv1alpha1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1alpha1"
"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive/pkg/vmcp/auth/converters"
authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/vmcp/auth/factory/outgoing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package factory
import (
"context"

"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive-core/env"
"github.com/stacklok/toolhive/pkg/vmcp/auth"
"github.com/stacklok/toolhive/pkg/vmcp/auth/strategies"
authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
Expand Down
2 changes: 1 addition & 1 deletion pkg/vmcp/auth/factory/outgoing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive-core/env"
authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/vmcp/auth/strategies/tokenexchange.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"sync"

"github.com/stacklok/toolhive-core/env"
"github.com/stacklok/toolhive/pkg/auth"
"github.com/stacklok/toolhive/pkg/auth/tokenexchange"
"github.com/stacklok/toolhive/pkg/env"
authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
"github.com/stacklok/toolhive/pkg/vmcp/health"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/vmcp/auth/strategies/tokenexchange_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"

"github.com/stacklok/toolhive-core/env/mocks"
"github.com/stacklok/toolhive/pkg/auth"
"github.com/stacklok/toolhive/pkg/env/mocks"
authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
"github.com/stacklok/toolhive/pkg/vmcp/health"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/vmcp/config/crd_cli_roundtrip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"go.uber.org/mock/gomock"
"gopkg.in/yaml.v3"

"github.com/stacklok/toolhive/pkg/env/mocks"
"github.com/stacklok/toolhive-core/env/mocks"
thvjson "github.com/stacklok/toolhive/pkg/json"
authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/vmcp/config/yaml_loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"gopkg.in/yaml.v3"

"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive-core/env"
authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/vmcp/config/yaml_loader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"go.uber.org/mock/gomock"

"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive/pkg/env/mocks"
"github.com/stacklok/toolhive-core/env"
"github.com/stacklok/toolhive-core/env/mocks"
"github.com/stacklok/toolhive/pkg/vmcp"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/vmcp/config/yaml_loader_transform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"

"github.com/stacklok/toolhive/pkg/env/mocks"
"github.com/stacklok/toolhive-core/env/mocks"
thvjson "github.com/stacklok/toolhive/pkg/json"
"github.com/stacklok/toolhive/pkg/telemetry"
authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
Expand Down
2 changes: 1 addition & 1 deletion pkg/workloads/statuses/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"context"
"fmt"

"github.com/stacklok/toolhive-core/env"
rt "github.com/stacklok/toolhive/pkg/container/runtime"
"github.com/stacklok/toolhive/pkg/core"
"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive/pkg/logger"
"github.com/stacklok/toolhive/pkg/workloads/types"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/workloads/statuses/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"

envmocks "github.com/stacklok/toolhive-core/env/mocks"
rt "github.com/stacklok/toolhive/pkg/container/runtime"
rtmocks "github.com/stacklok/toolhive/pkg/container/runtime/mocks"
"github.com/stacklok/toolhive/pkg/core"
envmocks "github.com/stacklok/toolhive/pkg/env/mocks"
"github.com/stacklok/toolhive/pkg/logger"
"github.com/stacklok/toolhive/pkg/workloads/types"
)
Expand Down
2 changes: 1 addition & 1 deletion test/integration/vmcp/helpers/vmcp_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/stretchr/testify/require"

"github.com/stacklok/toolhive-core/env"
"github.com/stacklok/toolhive/pkg/auth"
"github.com/stacklok/toolhive/pkg/env"
"github.com/stacklok/toolhive/pkg/telemetry"
vmcptypes "github.com/stacklok/toolhive/pkg/vmcp"
"github.com/stacklok/toolhive/pkg/vmcp/aggregator"
Expand Down
Loading