add FillID for vaults

Kong · Jan 4, 2024 · 2111597 · 2111597
1 parent 51814c5
commit 2111597
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -30,10 +30,8 @@ require (
 	github.com/google/uuid v1.5.0
 	github.com/jpillora/backoff v1.0.0
 	github.com/kong/go-database-reconciler v1.1.0
-	// TODO: Update to latest release version after the following PR merged:
-	// https://github.com/Kong/go-kong/pull/391
-	// https://github.com/Kong/go-kong/pull/392
-	github.com/kong/go-kong v0.48.1-0.20231228093107-7e35dcb56df9
+	// TODO: Update to latest release version after go-kong release:
+	github.com/kong/go-kong v0.48.1-0.20240103172413-d70e570d5b29
 	github.com/kong/kubernetes-telemetry v0.1.3
 	github.com/kong/kubernetes-testing-framework v0.43.0
 	github.com/lithammer/dedent v1.1.0

diff --git a/go.sum b/go.sum
@@ -255,8 +255,8 @@ github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJw
 github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/kong/go-database-reconciler v1.1.0 h1:USCdsAj/7eh9sOOfbnvsOe4jw5k4+FSTD3okcTLIVqQ=
 github.com/kong/go-database-reconciler v1.1.0/go.mod h1:p8NvafqBSuMR9YNCOZ24aIeeajc145+biXpAaMExvpI=
-github.com/kong/go-kong v0.48.1-0.20231228093107-7e35dcb56df9 h1:F9BWjM2hVEBasPTGInc+SAiiH+B3EbXa9ELgoFkg+XA=
-github.com/kong/go-kong v0.48.1-0.20231228093107-7e35dcb56df9/go.mod h1:xDf1RfkaE/rAwNE1fS3XniFj/d2JmkEER2S9NDY12Yw=
+github.com/kong/go-kong v0.48.1-0.20240103172413-d70e570d5b29 h1:NnswPs7ux6JsyggVLa4kX25hHt5oNt3XJUilkiadego=
+github.com/kong/go-kong v0.48.1-0.20240103172413-d70e570d5b29/go.mod h1:xDf1RfkaE/rAwNE1fS3XniFj/d2JmkEER2S9NDY12Yw=
 github.com/kong/kubernetes-telemetry v0.1.3 h1:Hz2tkHGIIUqbn1x46QRDmmNjbEtJyxyOvHSPne3uPto=
 github.com/kong/kubernetes-telemetry v0.1.3/go.mod h1:wB7o8dOKa5R396CyiU0sPa8am/g3c5DKd/qrn/Vmb+k=
 github.com/kong/kubernetes-testing-framework v0.43.0 h1:Pjh4NMlwApFqi9RPW5NPHD3mOCA62pHKLLX4pWnHGXw=

diff --git a/internal/dataplane/kongstate/kongstate.go b/internal/dataplane/kongstate/kongstate.go
@@ -256,7 +256,6 @@ func (ks *KongState) FillVaults(
 			)
 			continue
 		}
-		logger.V(util.DebugLevel).Info("add vault to kongstate", "name", vault.Name)
 		ks.Vaults = append(ks.Vaults, Vault{
 			Vault: kong.Vault{
 				Name:        kong.String(vault.Spec.Backend),
@@ -519,8 +518,13 @@ func (ks *KongState) FillIDs(logger logr.Logger) {
 		}
 	}
 
-	// TODO: Add FillID() for vaults in go-kong to fill IDs for vaults.
-	// https://github.com/Kong/go-kong/pull/391
+	for valutIndex, vault := range ks.Vaults {
+		if err := vault.FillID(); err != nil {
+			logger.Error(err, "Failed to fill ID for vault", "vault_name", vault.FriendlyName())
+		} else {
+			ks.Vaults[valutIndex] = vault
+		}
+	}
 }
 
 // maybeLogKongIngressDeprecationError iterates over services and logs a deprecation error if a service

diff --git a/internal/dataplane/kongstate/kongstate_test.go b/internal/dataplane/kongstate/kongstate_test.go
@@ -926,6 +926,37 @@ func TestKongState_FillIDs(t *testing.T) {
 				require.NotEmpty(t, s.Consumers[0].ID)
 			},
 		},
+		{
+			name: "fills consumer, consumer group, vault IDs",
+			state: KongState{
+				Consumers: []Consumer{
+					{
+						Consumer: kong.Consumer{
+							Username: kong.String("user.0"),
+						},
+					},
+				},
+				ConsumerGroups: []ConsumerGroup{
+					{
+						ConsumerGroup: kong.ConsumerGroup{
+							Name: kong.String("cg.0"),
+						},
+					},
+				},
+				Vaults: []Vault{
+					{
+						Vault: kong.Vault{
+							Prefix: kong.String("vault.0"),
+						},
+					},
+				},
+			},
+			expect: func(t *testing.T, s KongState) {
+				require.NotEmpty(t, s.Consumers[0].ID)
+				require.NotEmpty(t, s.ConsumerGroups[0].ID)
+				require.NotEmpty(t, s.Vaults[0].ID)
+			},
+		},
 	}
 
 	for _, tc := range testCases {

diff --git a/internal/store/store.go b/internal/store/store.go
@@ -692,7 +692,6 @@ func (s Store) ListKongVaults() []*kongv1alpha1.KongVault {
 			kongVaults = append(kongVaults, kongVault)
 		}
 	}
-	s.logger.V(util.DebugLevel).Info("listed kong vaults", "number", len(kongVaults))
 	return kongVaults
 }