Skip to content

Making the logic for loading customs simplir #911

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
i3149 merged 1 commit into from
Jun 25, 2026
Merged

Making the logic for loading customs simplir #911

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
21 changes: 5 additions & 16 deletions pkg/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ const (
MIN_TIME_BETWEEN_SYNTH_CHECKS = 60 * time.Second
KT_API_LOAD_INTERFACES = "KT_API_LOAD_INTERFACES"
KT_INTERFACE_LOOKUP_TEXT_FILTER = "KT_INTERFACE_LOOKUP_TEXT_FILTER"
KT_NO_CUSTOM_COLUMNS = "KT_NO_CUSTOM_COLUMNS"
KT_LOAD_CUSTOM_COLS_FOR_DEVS = "KT_LOAD_CUSTOM_COLS_FOR_DEVS"
KT_LOAD_CUSTOM_COLUMNS = "KT_LOAD_CUSTOM_COLUMNS"
KT_API_LAZY_LOAD_CUSTOMS = "KT_API_LAZY_LOAD_CUSTOMS"
)

Expand Down Expand Up @@ -74,6 +73,7 @@ type KentikApi struct {
tagLookupClient tagging.EnumerationsAdminServiceClient
loadInterfaces bool
lazyLoadCustoms bool
fullLoadCustoms bool
}

func NewKentikApi(ctx context.Context, log logger.ContextL, cfg *ktranslate.Config) (*KentikApi, error) {
Expand Down Expand Up @@ -102,9 +102,10 @@ func NewKentikApi(ctx context.Context, log logger.ContextL, cfg *ktranslate.Conf
config: cfg,
loadInterfaces: kt.LookupEnvBool(KT_API_LOAD_INTERFACES, false),
lazyLoadCustoms: kt.LookupEnvBool(KT_API_LAZY_LOAD_CUSTOMS, false),
fullLoadCustoms: kt.LookupEnvBool(KT_LOAD_CUSTOM_COLUMNS, false),
}

log.Infof("Setting API timeout to %v, loadInterfaces=%v, lazyLoadCustoms=%v", apiTimeout, kapi.loadInterfaces, kapi.lazyLoadCustoms)
log.Infof("Setting API timeout to %v, loadInterfaces=%v, lazyLoadCustoms=%v, fullyLoadCustoms=%v", apiTimeout, kapi.loadInterfaces, kapi.lazyLoadCustoms, kapi.fullLoadCustoms)
Comment on lines 104 to +108

// Now, check to see if synthetics API works.
err := kapi.connectSynthAndLookup(ctx)
Expand Down Expand Up @@ -521,10 +522,6 @@ func (api *KentikApi) getDeviceInfoNew(ctx context.Context) error {
resDev := map[kt.Cid]kt.Devices{}
num := 0
deviceIds := []string{}
deviceCustomsLoad := map[string]bool{}
for _, pts := range strings.Split(kt.LookupEnvString(KT_LOAD_CUSTOM_COLS_FOR_DEVS, ""), ",") {
deviceCustomsLoad[pts] = true
}

Comment on lines 522 to 525
for _, info := range api.config.KentikCreds {
md := metadata.New(map[string]string{
Expand All @@ -534,7 +531,7 @@ func (api *KentikApi) getDeviceInfoNew(ctx context.Context) error {
ctxo := metadata.NewOutgoingContext(ctx, md)

lt := &devicepb.ListDevicesRequest{
Query: &devicepb.DeviceQuery{NoCustomColumns: kt.LookupEnvBool(KT_NO_CUSTOM_COLUMNS, false)},
Query: &devicepb.DeviceQuery{NoCustomColumns: !api.fullLoadCustoms},
}
r, err := api.deviceClient.ListDevices(ctxo, lt)
if err != nil {
Expand All @@ -555,14 +552,6 @@ func (api *KentikApi) getDeviceInfoNew(ctx context.Context) error {
resDev[dev.CompanyID] = map[kt.DeviceID]*kt.Device{}
}

if deviceCustomsLoad[device.Id] {
err := api.loadCustoms(ctxo, device.GetId(), dev)
if err != nil {
api.Warnf("Cannot load custom columns for device %s: %v", dev.Name, err)
continue
}
}

deviceIds = append(deviceIds, device.Id)
resDev[dev.CompanyID][dev.ID] = dev
num++
Expand Down
Loading