Add more test cases for different scenarios #64
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
linglingye001
changed the title
|
|
||
| // when reconcile is triggered by single component refresh | ||
| // only update the corresponding component reconcile state and next refresh time | ||
| It("Should update reconcile state when keyValue pageEtag, featureFlag pageEtag and secret references updated when configuration, secret and feature flag refresh enabled", func() { |
There was a problem hiding this comment.
Should update the corresponding target's reconcile state, and those that shouldn't be updated should be as is.
| }]).Should(Equal(updatedFeatureFlagEtags[acpv1.Selector{ | ||
| KeyFilter: &wildcard, | ||
| }])) | ||
| Expect(processor.ReconciliationState.NextSecretReferenceRefreshReconcileTime).Should(Equal(expectedNextSecretReferenceRefreshReconcileTime)) |
There was a problem hiding this comment.
Assert the NextKeyValueRefreshReconcileTime and NextFeatureFlagRefreshReconcileTime not been updated, still keep the previous expectedNextKeyValueRefreshReconcileTime and cachedNextFeatureFlagRefreshReconcileTime value.
Comment on lines
152
to
456
| secretResult["testSecretKey"] = []byte("testSecretValue") | ||
| existingSecrets := make(map[string]corev1.Secret) | ||
| existingSecrets[secretName] = corev1.Secret{ | ||
| Data: secretResult, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| ResourceVersion: fakeSecretResourceVersion, | ||
| }, | ||
| } | ||
|
|
||
| var fakeId azsecrets.ID = "fakeSecretId" | ||
| var cachedFakeId azsecrets.ID = "cachedFakeSecretId" | ||
|
|
||
| secretMetadata := make(map[string]loader.KeyVaultSecretMetadata) | ||
| secretMetadata2 := make(map[string]loader.KeyVaultSecretMetadata) | ||
| cachedSecretReferences := make(map[string]*loader.TargetSecretReference) | ||
| secretMetadata["testSecretKey"] = loader.KeyVaultSecretMetadata{ | ||
| SecretId: &fakeId, | ||
| } | ||
| secretMetadata2["testSecretKey"] = loader.KeyVaultSecretMetadata{ | ||
| SecretId: &cachedFakeId, | ||
| } | ||
| cachedSecretReferences[secretName] = &loader.TargetSecretReference{ | ||
| Type: corev1.SecretType("Opaque"), | ||
| SecretsMetadata: secretMetadata2, | ||
| SecretResourceVersion: fakeSecretResourceVersion, | ||
| } | ||
|
|
||
| allSettings := &loader.TargetKeyValueSettings{ | ||
| SecretSettings: map[string]corev1.Secret{ | ||
| secretName: { | ||
| Data: secretResult, | ||
| Type: corev1.SecretType("Opaque"), | ||
| }, | ||
| }, | ||
| SecretReferences: map[string]*loader.TargetSecretReference{ | ||
| secretName: { | ||
| Type: corev1.SecretType("Opaque"), | ||
| SecretsMetadata: secretMetadata, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| configProvider := &acpv1.AzureAppConfigurationProvider{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
| APIVersion: "appconfig.kubernetes.config/v1", | ||
| Kind: "AzureAppConfigurationProvider", | ||
| }, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: providerName, | ||
| Namespace: ProviderNamespace, | ||
| Generation: 1, | ||
| }, | ||
| Spec: acpv1.AzureAppConfigurationProviderSpec{ | ||
| Endpoint: &EndpointName, | ||
| Target: acpv1.ConfigurationGenerationParameters{ | ||
| ConfigMapName: configMapName, | ||
| ConfigMapData: &acpv1.ConfigMapDataOptions{ | ||
| Type: "json", | ||
| Key: "filestyle.json", | ||
| }, | ||
| }, | ||
| Secret: &acpv1.SecretReference{ | ||
| Target: acpv1.SecretGenerationParameters{ | ||
| SecretName: secretName, | ||
| }, | ||
| Refresh: &acpv1.RefreshSettings{ | ||
| Interval: "1m", | ||
| Enabled: true, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| fakeResourceVersion := "1" | ||
| tmpTime := metav1.Now() | ||
| processor := AppConfigurationProviderProcessor{ | ||
| Context: ctx, | ||
| Retriever: mockConfigurationSettings, | ||
| Provider: configProvider, | ||
| ShouldReconcile: false, | ||
| Settings: &loader.TargetKeyValueSettings{}, | ||
| ReconciliationState: &ReconciliationState{ | ||
| NextSecretReferenceRefreshReconcileTime: tmpTime, | ||
| ExistingSecretReferences: cachedSecretReferences, | ||
| Generation: 1, | ||
| ConfigMapResourceVersion: &fakeResourceVersion, | ||
| }, | ||
| CurrentTime: metav1.NewTime(tmpTime.Time.Add(1 * time.Minute)), | ||
| RefreshOptions: &RefreshOptions{}, | ||
| } | ||
|
|
||
| mockConfigurationSettings.EXPECT().ResolveSecretReferences(gomock.Any(), gomock.Any(), gomock.Any()).Return(allSettings, nil) | ||
|
|
||
| _ = processor.PopulateSettings(&corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{ | ||
| ResourceVersion: fakeResourceVersion, | ||
| }}, existingSecrets) | ||
|
|
||
| _, _ = processor.Finish() | ||
|
|
||
| Expect(processor.ReconciliationState.ExistingSecretReferences).Should(Equal(allSettings.SecretReferences)) |
There was a problem hiding this comment.
Do we still need these tests? Shouldn't it has been covered by the last one?
RichardChen820
approved these changes
Aug 14, 2024
linglingye001
added a commit
that referenced
this pull request
Nov 8, 2024
* add more test for refresh scenarios * add more test cases * add more refresh test cases * resolve comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.