dapr
/
components-contrib
mirror of https://github.com/dapr/components-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Azure App Config not working with gRPC (#3358) 

Signed-off-by: Bernd Verst <github@bernd.dev>
This commit is contained in:
Bernd Verst 2024-02-21 10:41:06 -08:00 committed by GitHub
parent e114060fbb
commit f99604f063
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configuration/azure/appconfig/appconfig.go
View File

@ -32,6 +32,8 @@ import (
"github.com/dapr/components-contrib/configuration"
contribMetadata "github.com/dapr/components-contrib/metadata"
kitmd "github.com/dapr/kit/metadata"
"github.com/dapr/kit/logger"
)
@ -201,8 +203,14 @@ func (r *ConfigurationStore) getAll(ctx context.Context, req *configuration.GetR
}
func (r *ConfigurationStore) getLabelFromMetadata(metadata map[string]string) *string {
if s, ok := metadata["label"]; ok && s != "" {
return to.Ptr(s)
type labelMetadata = struct {
Label string `mapstructure:"label"`
}
var label labelMetadata
kitmd.DecodeMetadata(metadata, &label)
if label.Label != "" {
return to.Ptr(label.Label)
}
return nil
@ -284,9 +292,16 @@ func (r *ConfigurationStore) handleSubscribedChange(ctx context.Context, handler
}
func (r *ConfigurationStore) getSentinelKeyFromMetadata(metadata map[string]string) string {
if s, ok := metadata["sentinelKey"]; ok && s != "" {
return s
type sentinelKeyMetadata = struct {
SentinelKey string `mapstructure:"sentinelKey"`
}
var sentinelKey sentinelKeyMetadata
kitmd.DecodeMetadata(metadata, &sentinelKey)
if sentinelKey.SentinelKey != "" {
return sentinelKey.SentinelKey
}
return ""
}

2
configuration/azure/appconfig/appconfig_test.go
View File

@ -122,7 +122,7 @@ func Test_subscribeConfigurationWithProvidedKeys(t *testing.T) {
s.client = &MockConfigurationStore{}
metadata := make(map[string]string)
metadata["sentinelKey"] = "test_sentinel_key"
metadata["sentinelkey"] = "test_sentinel_key"
t.Run("call subscribe with sentinel key", func(t *testing.T) {
req := configuration.SubscribeRequest{