update

Azure · Sep 25, 2024 · 588dd07 · 588dd07
1 parent a78f53e
commit 588dd07
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 36 deletions.
diff --git a/api/v1/azureappconfigurationprovider_types.go b/api/v1/azureappconfigurationprovider_types.go
@@ -106,8 +106,7 @@ type RefreshMonitoring struct {
 
 // Defines the keyValues to be watched.
 type Sentinel struct {
-	// +kubebuilder:validation:MinLength=1
-	Key *string `json:"key"`
+	Key string `json:"key"`
 	// +kubebuilder:default="\x00"
 	Label *string `json:"label,omitempty"`
 }

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/azconfig.io_azureappconfigurationproviders.yaml b/config/crd/bases/azconfig.io_azureappconfigurationproviders.yaml
@@ -97,7 +97,6 @@ spec:
                               description: Defines the keyValues to be watched.
                               properties:
                                 key:
-                                  minLength: 1
                                   type: string
                                 label:
                                   default: "\0"

diff --git a/internal/controller/appconfigurationprovider_controller_test.go b/internal/controller/appconfigurationprovider_controller_test.go
@@ -653,7 +653,7 @@ var _ = Describe("AppConfiguationProvider controller", func() {
 							Enabled:  true,
 							Monitoring: &acpv1.RefreshMonitoring{
 								Sentinels: []acpv1.Sentinel{
-									{Key: &testKey, Label: &testLabel},
+									{Key: testKey, Label: &testLabel},
 								},
 							},
 						},
@@ -810,7 +810,7 @@ var _ = Describe("AppConfiguationProvider controller", func() {
 							Enabled:  true,
 							Monitoring: &acpv1.RefreshMonitoring{
 								Sentinels: []acpv1.Sentinel{
-									{Key: &testNewKey, Label: &testNewLabel},
+									{Key: testNewKey, Label: &testNewLabel},
 								},
 							},
 						},
@@ -886,7 +886,7 @@ var _ = Describe("AppConfiguationProvider controller", func() {
 							Enabled:  false,
 							Monitoring: &acpv1.RefreshMonitoring{
 								Sentinels: []acpv1.Sentinel{
-									{Key: &testNewKey, Label: &testNewLabel},
+									{Key: testNewKey, Label: &testNewLabel},
 								},
 							},
 						},
@@ -975,8 +975,8 @@ var _ = Describe("AppConfiguationProvider controller", func() {
 							Enabled:  true,
 							Monitoring: &acpv1.RefreshMonitoring{
 								Sentinels: []acpv1.Sentinel{
-									{Key: &testKeyOne, Label: &testLabelOne},
-									{Key: &testKeyTwo, Label: &testLabelTwo},
+									{Key: testKeyOne, Label: &testLabelOne},
+									{Key: testKeyTwo, Label: &testLabelTwo},
 								},
 							},
 						},
@@ -2279,15 +2279,15 @@ var _ = Describe("AppConfiguationProvider controller", func() {
 						Monitoring: &acpv1.RefreshMonitoring{
 							Sentinels: []acpv1.Sentinel{
 								{
-									Key:   &testKey,
+									Key:   testKey,
 									Label: &testLabelOne,
 								},
 								{
-									Key:   &testKey,
+									Key:   testKey,
 									Label: &testLabelTwo,
 								},
 								{
-									Key:   &testKey,
+									Key:   testKey,
 									Label: &testLabelOne,
 								},
 							},
@@ -2318,19 +2318,19 @@ var _ = Describe("AppConfiguationProvider controller", func() {
 						Monitoring: &acpv1.RefreshMonitoring{
 							Sentinels: []acpv1.Sentinel{
 								{
-									Key:   &testKey,
+									Key:   testKey,
 									Label: nil,
 								},
 								{
-									Key:   &testKey2,
+									Key:   testKey2,
 									Label: &testLabel,
 								},
 								{
-									Key:   &testKey3,
+									Key:   testKey3,
 									Label: nil,
 								},
 								{
-									Key:   &testKey4,
+									Key:   testKey4,
 									Label: &emptyLabel,
 								},
 							},
@@ -2414,7 +2414,7 @@ var _ = Describe("AppConfiguationProvider controller", func() {
 						Enabled:  true,
 						Monitoring: &acpv1.RefreshMonitoring{
 							Sentinels: []acpv1.Sentinel{
-								{Key: &testKey, Label: &testLabel},
+								{Key: testKey, Label: &testLabel},
 							},
 						},
 					},

diff --git a/internal/controller/processor_test.go b/internal/controller/processor_test.go
@@ -79,10 +79,10 @@ var _ = Describe("AppConfiguationProvider processor", func() {
 							Monitoring: &acpv1.RefreshMonitoring{
 								Sentinels: []acpv1.Sentinel{
 									{
-										Key: &sentinelKey1,
+										Key: sentinelKey1,
 									},
 									{
-										Key: &sentinelKey2,
+										Key: sentinelKey2,
 									},
 								},
 							},
@@ -104,7 +104,7 @@ var _ = Describe("AppConfiguationProvider processor", func() {
 					NextKeyValueRefreshReconcileTime: metav1.Now(),
 					SentinelETags: map[acpv1.Sentinel]*azcore.ETag{
 						{
-							Key: &sentinelKey1,
+							Key: sentinelKey1,
 						}: &fakeEtag,
 					},
 					Generation:               1,
@@ -123,10 +123,10 @@ var _ = Describe("AppConfiguationProvider processor", func() {
 				true,
 				map[acpv1.Sentinel]*azcore.ETag{
 					{
-						Key: &sentinelKey1,
+						Key: sentinelKey1,
 					}: &newFakeEtag1,
 					{
-						Key: &sentinelKey2,
+						Key: sentinelKey2,
 					}: &newFakeEtag2,
 				},
 				nil,
@@ -141,10 +141,10 @@ var _ = Describe("AppConfiguationProvider processor", func() {
 			_, _ = processor.Finish()
 
 			Expect(processor.ReconciliationState.SentinelETags[acpv1.Sentinel{
-				Key: &sentinelKey1,
+				Key: sentinelKey1,
 			}]).Should(Equal(&newFakeEtag1))
 			Expect(processor.ReconciliationState.SentinelETags[acpv1.Sentinel{
-				Key: &sentinelKey2,
+				Key: sentinelKey2,
 			}]).Should(Equal(&newFakeEtag2))
 			Expect(processor.ReconciliationState.NextKeyValueRefreshReconcileTime).Should(Equal(expectedNextKeyValueRefreshReconcileTime))
 		})

diff --git a/internal/controller/utils.go b/internal/controller/utils.go
@@ -124,7 +124,7 @@ func verifyObject(spec acpv1.AzureAppConfigurationProviderSpec) error {
 			sentinelMap := make(map[acpv1.Sentinel]bool)
 			for _, sentinel := range spec.Configuration.Refresh.Monitoring.Sentinels {
 				if _, ok := sentinelMap[sentinel]; ok {
-					return loader.NewArgumentError("spec.configuration.refresh.monitoring.keyValues", fmt.Errorf("monitoring duplicated key '%s'", *sentinel.Key))
+					return loader.NewArgumentError("spec.configuration.refresh.monitoring.keyValues", fmt.Errorf("monitoring duplicated key '%s'", sentinel.Key))
 				}
 				sentinelMap[sentinel] = true
 			}

diff --git a/internal/loader/configuraiton_setting_loader_test.go b/internal/loader/configuraiton_setting_loader_test.go
@@ -1345,11 +1345,11 @@ func TestGetFilters(t *testing.T) {
 				Monitoring: &acpv1.RefreshMonitoring{
 					Sentinels: []acpv1.Sentinel{
 						{
-							Key:   &one,
+							Key:   one,
 							Label: nil,
 						},
 						{
-							Key:   &two,
+							Key:   two,
 							Label: &emptyLabel,
 						},
 					},
@@ -1360,9 +1360,9 @@ func TestGetFilters(t *testing.T) {
 
 	sentinels := getSentinels(testSpec8.Configuration.Refresh.Monitoring.Sentinels)
 	assert.Len(t, sentinels, 2)
-	assert.Equal(t, "one", *sentinels[0].Key)
+	assert.Equal(t, "one", sentinels[0].Key)
 	assert.Nil(t, sentinels[0].Label)
-	assert.Equal(t, "two", *sentinels[1].Key)
+	assert.Equal(t, "two", sentinels[1].Key)
 	assert.Nil(t, sentinels[1].Label)
 }
 

diff --git a/internal/loader/settings_client.go b/internal/loader/settings_client.go
@@ -88,7 +88,7 @@ func (s *EtagSettingsClient) GetSettings(ctx context.Context, client *azappconfi
 }
 
 func (s *SentinelSettingsClient) GetSettings(ctx context.Context, client *azappconfig.Client) (*SettingsResponse, error) {
-	sentinelSetting, err := client.GetSetting(ctx, *s.sentinel.Key, &azappconfig.GetSettingOptions{Label: s.sentinel.Label, OnlyIfChanged: s.etag})
+	sentinelSetting, err := client.GetSetting(ctx, s.sentinel.Key, &azappconfig.GetSettingOptions{Label: s.sentinel.Label, OnlyIfChanged: s.etag})
 	if err != nil {
 		var respErr *azcore.ResponseError
 		if errors.As(err, &respErr) {
@@ -100,10 +100,10 @@ func (s *SentinelSettingsClient) GetSettings(ctx context.Context, client *azappc
 			}
 			switch respErr.StatusCode {
 			case 404:
-				klog.Warningf("Sentinel key '%s' with %s label does not exists, revisit the sentinel after %s", *s.sentinel.Key, label, s.refreshInterval)
+				klog.Warningf("Sentinel key '%s' with %s label does not exists, revisit the sentinel after %s", s.sentinel.Key, label, s.refreshInterval)
 				return nil, nil
 			case 304:
-				klog.V(3).Infof("There's no change to the sentinel key '%s' with %s label , just exit and revisit the sentinel after %s", *s.sentinel.Key, label, s.refreshInterval)
+				klog.V(3).Infof("There's no change to the sentinel key '%s' with %s label , just exit and revisit the sentinel after %s", s.sentinel.Key, label, s.refreshInterval)
 				return &SettingsResponse{
 					Settings: []azappconfig.Setting{sentinelSetting.Setting},
 				}, nil