Update azappconfig dependency to stable version (#11)

* update azappcfg dependency to stable version and remove page etag

* update

Author: linglingye001

azureappconfiguration.go

@@ -13,16 +13,14 @@ import (
 	"sync"
 
 	"github.com/Azure/AppConfiguration-GoProvider/azureappconfiguration/internal/tree"
-	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	decoder "github.com/go-viper/mapstructure/v2"
 	"golang.org/x/sync/errgroup"
 )
 
 type AzureAppConfiguration struct {
-	keyValues     map[string]any
-	keyValueETags map[Selector][]*azcore.ETag
-	kvSelectors   []Selector
-	trimPrefixes  []string
+	keyValues    map[string]any
+	kvSelectors  []Selector
+	trimPrefixes []string
 
 	clientManager *configurationClientManager
 	resolver      *keyVaultReferenceResolver
@@ -44,7 +42,6 @@ func Load(ctx context.Context, authentication AuthenticationOptions, options *Op
 
 	azappcfg := new(AzureAppConfiguration)
 	azappcfg.keyValues = make(map[string]any)
-	azappcfg.keyValueETags = make(map[Selector][]*azcore.ETag)
 	azappcfg.kvSelectors = deduplicateSelectors(options.Selectors)
 	azappcfg.trimPrefixes = options.TrimKeyPrefixes
 	azappcfg.clientManager = clientManager
@@ -186,7 +183,6 @@ func (azappcfg *AzureAppConfiguration) loadKeyValues(ctx context.Context, settin
 		return true
 	})
 
-	azappcfg.keyValueETags = settingsResponse.eTags
 	azappcfg.keyValues = kvSettings
 
 	return nil

azureappconfiguration_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -35,7 +34,6 @@ func TestLoadKeyValues_Success(t *testing.T) {
 			{Key: toPtr("key1"), Value: &value1, ContentType: toPtr("")},
 			{Key: toPtr("key2"), Value: &value2, ContentType: toPtr("application/json")},
 		},
-		eTags: map[Selector][]*azcore.ETag{},
 	}
 
 	mockClient.On("getSettings", ctx).Return(mockResponse, nil)
@@ -65,7 +63,6 @@ func TestLoadKeyValues_WithKeyVaultReferences(t *testing.T) {
 			{Key: toPtr("key1"), Value: toPtr("value1"), ContentType: toPtr("")},
 			{Key: toPtr("secret1"), Value: toPtr(kvReference), ContentType: toPtr(secretReferenceContentType)},
 		},
-		eTags: map[Selector][]*azcore.ETag{},
 	}
 
 	mockSettingsClient.On("getSettings", ctx).Return(mockResponse, nil)
@@ -105,7 +102,6 @@ func TestLoadKeyValues_WithTrimPrefix(t *testing.T) {
 			{Key: toPtr("other:key2"), Value: &value2, ContentType: toPtr("")},
 			{Key: toPtr("key3"), Value: &value3, ContentType: toPtr("")},
 		},
-		eTags: map[Selector][]*azcore.ETag{},
 	}
 
 	mockClient.On("getSettings", ctx).Return(mockResponse, nil)
@@ -134,7 +130,6 @@ func TestLoadKeyValues_EmptyKeyAfterTrim(t *testing.T) {
 		settings: []azappconfig.Setting{
 			{Key: toPtr("prefix:"), Value: &value1, ContentType: toPtr("")},
 		},
-		eTags: map[Selector][]*azcore.ETag{},
 	}
 
 	mockClient.On("getSettings", ctx).Return(mockResponse, nil)
@@ -163,7 +158,6 @@ func TestLoadKeyValues_InvalidJson(t *testing.T) {
 			{Key: toPtr("key1"), Value: &value1, ContentType: toPtr("")},
 			{Key: toPtr("key2"), Value: &value2, ContentType: toPtr("application/json")},
 		},
-		eTags: map[Selector][]*azcore.ETag{},
 	}
 
 	mockClient.On("getSettings", ctx).Return(mockResponse, nil)
@@ -679,7 +673,6 @@ func TestLoadKeyValues_WithConcurrentKeyVaultReferences(t *testing.T) {
 			{Key: toPtr("secret2"), Value: toPtr(kvReference2), ContentType: toPtr(secretReferenceContentType)},
 			{Key: toPtr("secret3"), Value: toPtr(kvReference3), ContentType: toPtr(secretReferenceContentType)},
 		},
-		eTags: map[Selector][]*azcore.ETag{},
 	}
 
 	mockSettingsClient.On("getSettings", ctx).Return(mockResponse, nil)

go.mod

@@ -2,7 +2,7 @@ module github.com/Azure/AppConfiguration-GoProvider/azureappconfiguration
 
 go 1.23.0
 
-require github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.2.0-beta.1
+require github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.1.0
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect

go.sum

@@ -2,8 +2,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WW
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 h1:F0gBpfdPLGsw+nsgk6aqqkZS1jiixa5WwFe3fk/T3Ys=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2/go.mod h1:SqINnQ9lVVdRlyC8cd1lCI0SdX4n2paeABd2K8ggfnE=
-github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.2.0-beta.1 h1:wSwUNd/Tbq0e0zZjWuRQL4tsBxoZ0tYIJe+rBZZQApY=
-github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.2.0-beta.1/go.mod h1:0uyyPvSFLlPiPzoTTLXN6wR9sFFqL6iPVd4FAugCooo=
+github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.1.0 h1:AdaGDU3FgoUC2tsd3vsd9JblRrpFLUsS38yh1eLYfwM=
+github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.1.0/go.mod h1:6tpINME7dnF7bLlb8Ubj6FtM9CFZrCn7aT02pcYrklM=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
 github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.1 h1:mrkDCdkMsD4l9wjFGhofFHFrV43Y3c53RSLKOCJ5+Ow=

settings_client.go

@@ -6,14 +6,13 @@ package azureappconfiguration
 import (
 	"context"
 
-	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
 	"github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig"
 )
 
 type settingsResponse struct {
 	settings []azappconfig.Setting
-	eTags    map[Selector][]*azcore.ETag
+	// TODO: pageETags
 }
 
 type selectorSettingsClient struct {
@@ -27,32 +26,25 @@ type settingsClient interface {
 
 func (s *selectorSettingsClient) getSettings(ctx context.Context) (*settingsResponse, error) {
 	settings := make([]azappconfig.Setting, 0)
-	pageETags := make(map[Selector][]*azcore.ETag)
-
 	for _, filter := range s.selectors {
 		selector := azappconfig.SettingSelector{
 			KeyFilter:   to.Ptr(filter.KeyFilter),
 			LabelFilter: to.Ptr(filter.LabelFilter),
 			Fields:      azappconfig.AllSettingFields(),
 		}
-		pager := s.client.NewListSettingsPager(selector, nil)
-		latestEtags := make([]*azcore.ETag, 0)
 
+		pager := s.client.NewListSettingsPager(selector, nil)
 		for pager.More() {
 			page, err := pager.NextPage(ctx)
 			if err != nil {
 				return nil, err
 			} else if page.Settings != nil {
 				settings = append(settings, page.Settings...)
-				latestEtags = append(latestEtags, page.ETag)
 			}
 		}
-		// update the etags for the filter
-		pageETags[filter] = latestEtags
 	}
 
 	return &settingsResponse{
 		settings: settings,
-		eTags:    pageETags,
 	}, nil
 }