fix: Make operator include full OIDC secret in repo config (#5676) (#… · feast-dev/feast@a536bc2
@@ -214,17 +214,22 @@ var _ = Describe("Repo Config", func() {
214214repoConfig, err = getServiceRepoConfig(featureStore, secretExtractionFunc)
215215Expect(err).NotTo(HaveOccurred())
216216Expect(repoConfig.AuthzConfig.Type).To(Equal(OidcAuthType))
217-Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveLen(2))
217+Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveLen(5))
218218Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcClientId)))
219219Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcAuthDiscoveryUrl)))
220+Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcClientSecret)))
221+Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcUsername)))
222+Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcPassword)))
220223Expect(repoConfig.OfflineStore).To(Equal(expectedOfflineConfig))
221224Expect(repoConfig.OnlineStore).To(Equal(defaultOnlineStoreConfig(featureStore)))
222225Expect(repoConfig.Registry).To(Equal(defaultRegistryConfig(featureStore)))
223226224227repoConfig, err = getClientRepoConfig(featureStore, secretExtractionFunc, nil)
225228Expect(err).NotTo(HaveOccurred())
226229Expect(repoConfig.AuthzConfig.Type).To(Equal(OidcAuthType))
227-Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveLen(3))
230+Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveLen(5))
231+Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcClientId)))
232+Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcAuthDiscoveryUrl)))
228233Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcClientSecret)))
229234Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcUsername)))
230235Expect(repoConfig.AuthzConfig.OidcParameters).To(HaveKey(string(OidcPassword)))
@@ -314,14 +319,9 @@ var _ = Describe("Repo Config", func() {
314319_, err := getServiceRepoConfig(featureStore, secretExtractionFunc)
315320Expect(err).To(HaveOccurred())
316321Expect(err.Error()).To(ContainSubstring("missing OIDC secret"))
317-_, err = getServiceRepoConfig(featureStore, secretExtractionFunc)
318-Expect(err).To(HaveOccurred())
319-Expect(err.Error()).To(ContainSubstring("missing OIDC secret"))
320-_, err = getServiceRepoConfig(featureStore, secretExtractionFunc)
322+_, err = getClientRepoConfig(featureStore, secretExtractionFunc, nil)
321323Expect(err).To(HaveOccurred())
322324Expect(err.Error()).To(ContainSubstring("missing OIDC secret"))
323-_, err = getClientRepoConfig(featureStore, secretExtractionFunc, nil)
324-Expect(err).ToNot(HaveOccurred())
325325326326By("Having invalid client oidc authorization")
327327featureStore.Spec.AuthzConfig = &feastdevv1.AuthzConfig{
@@ -341,12 +341,6 @@ var _ = Describe("Repo Config", func() {
341341_, err = getServiceRepoConfig(featureStore, secretExtractionFunc)
342342Expect(err).To(HaveOccurred())
343343Expect(err.Error()).To(ContainSubstring("missing OIDC secret"))
344-_, err = getServiceRepoConfig(featureStore, secretExtractionFunc)
345-Expect(err).To(HaveOccurred())
346-Expect(err.Error()).To(ContainSubstring("missing OIDC secret"))
347-_, err = getServiceRepoConfig(featureStore, secretExtractionFunc)
348-Expect(err).To(HaveOccurred())
349-Expect(err.Error()).To(ContainSubstring("missing OIDC secret"))
350344_, err = getClientRepoConfig(featureStore, secretExtractionFunc, nil)
351345Expect(err).To(HaveOccurred())
352346Expect(err.Error()).To(ContainSubstring("missing OIDC secret"))