Skip to content

Commit deb6900

Browse files
TofelTofel
committed
remove superflous functions
1 parent 5223935 commit deb6900

File tree

5 files changed

+31
-44
lines changed

5 files changed

+31
-44
lines changed

‎core/scripts/cre/environment/environment/beholder.go‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ func startBeholderCmd() *cobra.Command {
289289
return fmt.Errorf("failed to set TESTCONTAINERS_RYUK_DISABLED environment variable: %w", setErr)
290290
}
291291

292-
if routerErr := hydrateChipRouterForBeholder(cmd.Context()); routerErr != nil {
293-
return errors.Wrap(routerErr, "failed to hydrate chip ingress router. Please make sure that local CRE environment is started and that the chip ingress router is running")
292+
if routerErr := chiprouter.EnsureStarted(cmd.Context()); routerErr != nil {
293+
return errors.Wrap(routerErr, "failed to ensure chip ingress router is running. Please make sure that local CRE environment is started and that the chip ingress router is running")
294294
}
295295

296296
startBeholderErr = startBeholder(cmd.Context(), timeout, port)
@@ -325,10 +325,6 @@ func mustStringToInt(in string) int {
325325
return out
326326
}
327327

328-
func hydrateChipRouterForBeholder(ctx context.Context) error {
329-
return chiprouter.EnsureStarted(ctx, relativePathToRepoRoot, "")
330-
}
331-
332328
func loadPersistedBeholderState(relativePathToRepoRoot string) (*envconfig.ChipIngressConfig, error) {
333329
absPath := envconfig.MustChipIngressStateFileAbsPath(relativePathToRepoRoot)
334330
if _, err := os.Stat(absPath); err != nil {
@@ -386,7 +382,7 @@ func stopBeholder() error {
386382
framework.L.Warn().Err(loadSubscriberErr).Msg("failed to load Beholder router subscriber id")
387383
}
388384
if subscriberID != "" {
389-
unregisterErr := chiprouter.UnregisterSubscriber(context.Background(), relativePathToRepoRoot, subscriberID)
385+
unregisterErr := chiprouter.UnregisterSubscriber(context.Background(), subscriberID)
390386
if unregisterErr != nil && !os.IsNotExist(unregisterErr) && !strings.Contains(unregisterErr.Error(), "local CRE state file not found") && !strings.Contains(unregisterErr.Error(), "no such file or directory") {
391387
framework.L.Warn().Err(unregisterErr).Msg("failed to unregister Beholder from chip ingress router")
392388
}
@@ -813,10 +809,10 @@ func registerBeholderWithRouter(ctx context.Context, port int) error {
813809
func registerBeholderEndpointWithRouter(ctx context.Context, endpoint string) error {
814810
previousID, err := loadBeholderSubscriberID(relativePathToRepoRoot)
815811
if err == nil && previousID != "" {
816-
_ = chiprouter.UnregisterSubscriber(ctx, relativePathToRepoRoot, previousID)
812+
_ = chiprouter.UnregisterSubscriber(ctx, previousID)
817813
}
818814

819-
id, err := chiprouter.RegisterSubscriber(ctx, relativePathToRepoRoot, "beholder", endpoint)
815+
id, err := chiprouter.RegisterSubscriber(ctx, "beholder", endpoint)
820816
if err != nil {
821817
return err
822818
}

‎system-tests/lib/cre/chiprouter/router.go‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package chiprouter
22

33
import (
44
"context"
5+
"errors"
56
"net"
67
"net/netip"
78
"os"
@@ -21,21 +22,33 @@ var (
2122
errClient error
2223
)
2324

24-
func getClient(ctx context.Context, relativePathToRepoRoot string) (*ctfchiprouterclient.Client, error) {
25+
func getClient(ctx context.Context) (*ctfchiprouterclient.Client, error) {
2526
clientOnce.Do(func() {
26-
st, err := envconfig.LoadChipIngressRouterStateFromLocalCRE(relativePathToRepoRoot)
27+
in := &envconfig.Config{}
28+
err := in.Load(os.Getenv("CTF_CONFIGS"))
2729
if err != nil {
2830
errClient = err
2931
return
3032
}
31-
clientInst, errClient = ctfchiprouterclient.New(ctx, st.AdminURL, st.GRPCURL)
33+
34+
if in.ChipRouter == nil || in.ChipRouter.Out == nil {
35+
errClient = errors.New("chip router output not found in local CRE state")
36+
return
37+
}
38+
39+
// st, err := envconfig.LoadChipIngressRouterStateFromLocalCRE(relativePathToRepoRoot)
40+
// if err != nil {
41+
// errClient = err
42+
// return
43+
// }
44+
clientInst, errClient = ctfchiprouterclient.New(ctx, in.ChipRouter.Out.ExternalAdminURL, in.ChipRouter.Out.ExternalGRPCURL)
3245
})
3346

3447
return clientInst, errClient
3548
}
3649

37-
func EnsureStarted(ctx context.Context, relativePathToRepoRoot, _ string) error {
38-
_, err := getClient(ctx, relativePathToRepoRoot)
50+
func EnsureStarted(ctx context.Context) error {
51+
_, err := getClient(ctx)
3952
if err != nil {
4053
if os.IsNotExist(err) {
4154
return pkgerrors.New("local CRE state file not found; start the environment first")
@@ -46,21 +59,21 @@ func EnsureStarted(ctx context.Context, relativePathToRepoRoot, _ string) error
4659
return nil
4760
}
4861

49-
func RegisterSubscriber(ctx context.Context, relativePathToRepoRoot, name, endpoint string) (string, error) {
50-
c, err := getClient(ctx, relativePathToRepoRoot)
62+
func RegisterSubscriber(ctx context.Context, name, endpoint string) (string, error) {
63+
c, err := getClient(ctx)
5164
if err != nil {
5265
return "", err
5366
}
5467

5568
return c.RegisterSubscriber(ctx, name, normalizeEndpointForRouter(endpoint))
5669
}
5770

58-
func UnregisterSubscriber(ctx context.Context, relativePathToRepoRoot, id string) error {
71+
func UnregisterSubscriber(ctx context.Context, id string) error {
5972
if strings.TrimSpace(id) == "" {
6073
return nil
6174
}
6275

63-
c, err := getClient(ctx, relativePathToRepoRoot)
76+
c, err := getClient(ctx)
6477
if err != nil {
6578
if os.IsNotExist(err) {
6679
return nil

‎system-tests/lib/cre/environment/config/config.go‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -293,28 +293,6 @@ func ChipIngressStateFileExists(relativePathToRepoRoot string) bool {
293293
return statErr == nil
294294
}
295295

296-
type ChipIngressRouterState struct {
297-
AdminURL string `toml:"admin_url"`
298-
GRPCURL string `toml:"grpc_url"`
299-
ContainerName string `toml:"container_name"`
300-
}
301-
302-
func LoadChipIngressRouterStateFromLocalCRE(relativePathToRepoRoot string) (*ChipIngressRouterState, error) {
303-
cfg := &Config{}
304-
if err := cfg.Load(MustLocalCREStateFileAbsPath(relativePathToRepoRoot)); err != nil {
305-
return nil, errors.Wrap(err, "failed to load local CRE state")
306-
}
307-
if cfg.ChipRouter == nil || cfg.ChipRouter.Out == nil {
308-
return nil, errors.New("chip router output not found in local CRE state")
309-
}
310-
311-
return &ChipIngressRouterState{
312-
AdminURL: cfg.ChipRouter.Out.ExternalAdminURL,
313-
GRPCURL: cfg.ChipRouter.Out.ExternalGRPCURL,
314-
ContainerName: cfg.ChipRouter.Out.ContainerName,
315-
}, nil
316-
}
317-
318296
func storeLocalArtifact(artifact any, absPath string) error {
319297
dErr := os.MkdirAll(filepath.Dir(absPath), 0o755)
320298
if dErr != nil {

‎system-tests/tests/test-helpers/before_suite.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func getOrCreateSharedEnvironment(t *testing.T, tconf *ttypes.TestConfig, flags
126126

127127
entry.once.Do(func() {
128128
createEnvironment(t, tconf, flags...)
129-
require.NoError(t, chiprouter.EnsureStarted(t.Context(), tconf.RelativePathToRepoRoot, tconf.EnvironmentDirPath), "failed to ensure chip ingress router is running")
129+
require.NoError(t, chiprouter.EnsureStarted(t.Context()), "failed to ensure chip ingress router is running")
130130
in := getEnvironmentConfig(t)
131131
creEnvironment, dons, err := environment.BuildFromSavedState(t.Context(), cldlogger.NewSingleFileLogger(t), in)
132132
if err != nil {

‎system-tests/tests/test-helpers/chip_testsink_helpers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (s *registeredChipSink) Shutdown(ctx context.Context) {
4646
if s == nil {
4747
return
4848
}
49-
if err := chiprouter.UnregisterSubscriber(ctx, s.relativePath, s.subscriberID); err != nil && !os.IsNotExist(err) {
49+
if err := chiprouter.UnregisterSubscriber(ctx, s.subscriberID); err != nil && !os.IsNotExist(err) {
5050
framework.L.Warn().Msgf("failed to unregister chip sink subscriber: %s", err)
5151
}
5252
if s.server != nil {
@@ -632,9 +632,9 @@ func StartChipTestSink(t *testing.T, publishFn chiptestsink.PublishFn) ChipSink
632632
require.FailNow(t, "timeout waiting for test sink listen address")
633633
}
634634

635-
require.NoError(t, chiprouter.EnsureStarted(t.Context(), relativePathToRepoRoot, filepath.Join(relativePathToRepoRoot, "core/scripts/cre/environment")), "failed to ensure chip ingress router is running")
635+
require.NoError(t, chiprouter.EnsureStarted(t.Context()), "failed to ensure chip ingress router is running")
636636

637-
subscriberID, err := chiprouter.RegisterSubscriber(t.Context(), relativePathToRepoRoot, t.Name(), actualAddr)
637+
subscriberID, err := chiprouter.RegisterSubscriber(t.Context(), t.Name(), actualAddr)
638638
require.NoError(t, err, "failed to register test sink with chip ingress router")
639639

640640
return &registeredChipSink{

0 commit comments

Comments
 (0)