Skip to content

Commit 1e92eb5

Browse files
authored
Error on missing tenant secrets (#34)
Signed-off-by: Saswata Mukherjee <[email protected]>
1 parent da25a83 commit 1e92eb5

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

pkg/syncer/obsctlsyncer.go

+11-1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ func AutoDetectTenantSecrets(
126126

127127
// Filter secrets for configured tenants.
128128
configuredTenants := strings.Split(managedTenants, ",")
129+
missingSecretTenants := strings.Split(managedTenants, ",")
129130
for i := range secret.Items {
130131
lbls := secret.Items[i].Labels
131132

@@ -136,6 +137,9 @@ func AutoDetectTenantSecrets(
136137
// If tenant is not configured, skip.
137138
if !slices.Contains(configuredTenants, lbls["tenant"]) {
138139
continue
140+
} else {
141+
s, _ := slices.BinarySearch(missingSecretTenants, lbls["tenant"])
142+
missingSecretTenants = slices.Delete(missingSecretTenants, s, s+1)
139143
}
140144

141145
if secret.Items[i].Data == nil {
@@ -171,6 +175,10 @@ func AutoDetectTenantSecrets(
171175
tenantSecret[lbls["tenant"]] = tOIDC
172176
}
173177

178+
if len(missingSecretTenants) != 0 {
179+
return tenantSecret, errors.Newf("missing secrets for tenants: %v", missingSecretTenants)
180+
}
181+
174182
return tenantSecret, nil
175183
}
176184

@@ -201,7 +209,9 @@ func (o *ObsctlRulesSyncer) InitOrReloadObsctlConfig() error {
201209
tenantSecrets, err := o.autoDetectSecretsFn(o.ctx, o.k8s, o.namespace, o.audience, o.issuerURL, o.managedTenants)
202210
if err != nil {
203211
level.Error(o.logger).Log("msg", "auto detecting tenant secrets", "error", err)
204-
return errors.Wrap(err, "auto detecting tenant secrets")
212+
if len(tenantSecrets) == 0 {
213+
return errors.Wrap(err, "no tenant secrets auto-detected")
214+
}
205215
}
206216

207217
// Add all managed tenants under the API.

0 commit comments

Comments
 (0)