Skip to content

Commit aeedfcc

Browse files
committed
feat: Update naming to avoid feature conflicts
1 parent 675b5e1 commit aeedfcc

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

e2e/create_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ func createWorkspace(t *testing.T, bridgeBin, projectRoot string, cluster *testu
5959

6060
// Copy the bridge feature into .devcontainer/ (the devcontainer CLI
6161
// requires local features to live under .devcontainer/).
62-
srcFeature := filepath.Join(projectRoot, "features", "bridge")
63-
dstFeature := filepath.Join(dcDir, "local-features", "bridge")
62+
srcFeature := filepath.Join(projectRoot, "features", "bridge-feature")
63+
dstFeature := filepath.Join(dcDir, "local-features", "bridge-feature")
6464
require.NoError(t, copyDir(srcFeature, dstFeature))
6565

6666
cfg := &devcontainer.Config{
@@ -197,7 +197,7 @@ func (s *CreateSuite) TestFullstackCreate() {
197197
"--admin-addr", adminAddr,
198198
"--yes",
199199
"--connect",
200-
"--feature-ref", "../local-features/bridge",
200+
"--feature-ref", "../local-features/bridge-feature",
201201
"-f", filepath.Join(s.workspaceDir, ".devcontainer", "devcontainer.json"),
202202
})
203203
}()

features/bridge/devcontainer-feature.json renamed to features/bridge-feature/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "bridge",
2+
"id": "bridge-feature",
33
"version": "1.4.0",
44
"name": "Bridge Tunnel Client",
55
"description": "Connects to a bridge proxy server to intercept outbound traffic via iptables and tunnel it over gRPC.",

pkg/commands/create.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"github.com/vercel/bridge/pkg/interact"
2323
)
2424

25-
const defaultFeatureRef = "ghcr.io/vercel/bridge/features/bridge:edge"
26-
const devFeatureRef = "../local-features/bridge"
25+
const defaultFeatureRef = "ghcr.io/vercel/bridge/features/bridge-feature:edge"
26+
const devFeatureRef = "../local-features/bridge-feature"
2727

2828
const defaultAdminAddr = "k8spf:///administrator.bridge:9090?workload=deployment"
2929
const defaultProxyImage = "ghcr.io/vercel/bridge:edge"

0 commit comments

Comments
 (0)