Merge branch 'mk/sdk-895/add-data-system' into mk/sdk-896/remove-old-…

…configs

sdktests/common_tests_stream_fdv2.go

@@ -44,7 +44,7 @@ func (c CommonStreamingTests) StateTransitions(t *ldtest.T) {
 }
 
 func (c CommonStreamingTests) InitializeFromEmptyState(t *ldtest.T) {
-	streamEndpoint, _ := makeSequentialStreamHandler(t, c.makeSDKDataWithFlag("flag-key", 1, initialValue))
+	streamEndpoint, _ := makeSequentialStreamHandler(t, c.makeSDKDataWithFlag(1, initialValue))
 	t.Defer(streamEndpoint.Close)
 	client := NewSDKClient(t, WithStreamingConfig(baseStreamConfig(streamEndpoint)))
 
@@ -53,7 +53,7 @@ func (c CommonStreamingTests) InitializeFromEmptyState(t *ldtest.T) {
 }
 
 func (c CommonStreamingTests) SavesPreviouslyKnownState(t *ldtest.T) {
-	dataBefore := c.makeSDKDataWithFlag("flag-key", 1, initialValue)
+	dataBefore := c.makeSDKDataWithFlag(1, initialValue)
 	dataAfter := mockld.NewServerSDKDataBuilder().IntentCode("xfer-none").IntentReason("up-to-date").Build()
 	streamEndpoint, _ := makeSequentialStreamHandler(t, dataBefore, dataAfter)
 	t.Defer(streamEndpoint.Close)
@@ -67,7 +67,7 @@ func (c CommonStreamingTests) SavesPreviouslyKnownState(t *ldtest.T) {
 }
 
 func (c CommonStreamingTests) ReplacesPreviouslyKnownState(t *ldtest.T) {
-	dataBefore := c.makeSDKDataWithFlag("flag-key", 1, initialValue)
+	dataBefore := c.makeSDKDataWithFlag(1, initialValue)
 	dataAfter := mockld.NewServerSDKDataBuilder().
 		IntentCode("xfer-full").
 		IntentReason("cant-catchup").
@@ -88,7 +88,7 @@ func (c CommonStreamingTests) ReplacesPreviouslyKnownState(t *ldtest.T) {
 }
 
 func (c CommonStreamingTests) UpdatesPreviouslyKnownState(t *ldtest.T) {
-	dataBefore := c.makeSDKDataWithFlag("flag-key", 1, initialValue)
+	dataBefore := c.makeSDKDataWithFlag(1, initialValue)
 	dataAfter := mockld.NewServerSDKDataBuilder().
 		IntentCode("xfer-changes").
 		IntentReason("stale").
@@ -108,7 +108,7 @@ func (c CommonStreamingTests) UpdatesPreviouslyKnownState(t *ldtest.T) {
 }
 
 func (c CommonStreamingTests) UpdatesAreNotCompleteUntilPayloadTransferredIsSent(t *ldtest.T) {
-	data := c.makeSDKDataWithFlag("flag-key", 1, initialValue)
+	data := c.makeSDKDataWithFlag(1, initialValue)
 	stream := NewSDKDataSourceWithoutEndpoint(t, data)
 	streamEndpoint := requireContext(t).harness.NewMockEndpoint(stream.Handler(), t.DebugLogger(),
 		harness.MockEndpointDescription("streaming service"))
@@ -148,7 +148,7 @@ func (c CommonStreamingTests) UpdatesAreNotCompleteUntilPayloadTransferredIsSent
 }
 
 func (c CommonStreamingTests) IgnoresModelVersion(t *ldtest.T) {
-	data := c.makeSDKDataWithFlag("flag-key", 100, initialValue)
+	data := c.makeSDKDataWithFlag(100, initialValue)
 	stream := NewSDKDataSourceWithoutEndpoint(t, data)
 	streamEndpoint := requireContext(t).harness.NewMockEndpoint(stream.Handler(), t.DebugLogger(),
 		harness.MockEndpointDescription("streaming service"))
@@ -173,7 +173,7 @@ func (c CommonStreamingTests) IgnoresModelVersion(t *ldtest.T) {
 }
 
 func (c CommonStreamingTests) IgnoresHeartBeat(t *ldtest.T) {
-	data := c.makeSDKDataWithFlag("flag-key", 1, initialValue)
+	data := c.makeSDKDataWithFlag(1, initialValue)
 	stream := NewSDKDataSourceWithoutEndpoint(t, data)
 	streamEndpoint := requireContext(t).harness.NewMockEndpoint(stream.Handler(), t.DebugLogger(),
 		harness.MockEndpointDescription("streaming service"))
@@ -196,7 +196,7 @@ func (c CommonStreamingTests) IgnoresHeartBeat(t *ldtest.T) {
 }
 
 func (c CommonStreamingTests) DiscardsEventsOnError(t *ldtest.T) {
-	data := c.makeSDKDataWithFlag("flag-key", 1, initialValue)
+	data := c.makeSDKDataWithFlag(1, initialValue)
 	stream := NewSDKDataSourceWithoutEndpoint(t, data)
 	streamEndpoint := requireContext(t).harness.NewMockEndpoint(stream.Handler(), t.DebugLogger(),
 		harness.MockEndpointDescription("streaming service"))
@@ -229,7 +229,7 @@ func (c CommonStreamingTests) DiscardsEventsOnError(t *ldtest.T) {
 }
 
 func (c CommonStreamingTests) DisconnectsOnGoodbye(t *ldtest.T) {
-	dataBefore := c.makeSDKDataWithFlag("flag-key", 1, initialValue)
+	dataBefore := c.makeSDKDataWithFlag(1, initialValue)
 	dataAfter := mockld.NewServerSDKDataBuilder().IntentCode("xfer-none").IntentReason("up-to-date").Build()
 	streamEndpoint, streams := makeSequentialStreamHandler(t, dataBefore, dataAfter)
 	t.Defer(streamEndpoint.Close)

sdktests/common_tests_stream_updates.go

@@ -9,13 +9,13 @@ import (
 	"github.com/launchdarkly/go-sdk-common/v3/ldvalue"
 )
 
-func (c CommonStreamingTests) makeSDKDataWithFlag(key string, version int, value ldvalue.Value) mockld.SDKData {
+func (c CommonStreamingTests) makeSDKDataWithFlag(version int, value ldvalue.Value) mockld.SDKData {
 	if c.isClientSide {
 		return mockld.NewClientSDKDataBuilder().
-			Flag(key, c.makeClientSideFlag(key, version, value).ClientSDKFlag).
+			Flag("flag-key", c.makeClientSideFlag("flag-key", version, value).ClientSDKFlag).
 			Build()
 	}
-	return mockld.NewServerSDKDataBuilder().Flag(c.makeServerSideFlag(key, version, value)).Build()
+	return mockld.NewServerSDKDataBuilder().Flag(c.makeServerSideFlag("flag-key", version, value)).Build()
 }
 
 func (c CommonStreamingTests) makeFlagData(key string, version int, value ldvalue.Value) []byte {

sdktests/server_side_persistence_base.go

@@ -349,7 +349,7 @@ func (s *ServerSidePersistentTests) Run(t *ldtest.T) {
 				Mode: servicedef.CacheModeOff,
 			})
 
-			sdkData := s.makeSDKDataWithFlag("flag-key", 1, ldvalue.String("value"))
+			sdkData := s.makeSDKDataWithFlag(1, ldvalue.String("value"))
 			_, configurers := s.setupDataSources(t, sdkData)
 			configurers = append(configurers, persistence)
 
@@ -370,7 +370,7 @@ func (s *ServerSidePersistentTests) Run(t *ldtest.T) {
 				Mode: servicedef.CacheModeOff,
 			})
 
-			sdkData := s.makeSDKDataWithFlag("flag-key", 1, ldvalue.String("value"))
+			sdkData := s.makeSDKDataWithFlag(1, ldvalue.String("value"))
 			stream, configurers := s.setupDataSources(t, sdkData)
 			configurers = append(configurers, persistence)
 
@@ -400,7 +400,7 @@ func (s *ServerSidePersistentTests) Run(t *ldtest.T) {
 				Mode: servicedef.CacheModeOff,
 			})
 
-			sdkData := s.makeSDKDataWithFlag("flag-key", 1, ldvalue.String("value"))
+			sdkData := s.makeSDKDataWithFlag(1, ldvalue.String("value"))
 			stream, configurers := s.setupDataSources(t, sdkData)
 			configurers = append(configurers, persistence)
 
@@ -444,7 +444,7 @@ func (s *ServerSidePersistentTests) Run(t *ldtest.T) {
 				Mode: servicedef.CacheModeOff,
 			})
 
-			sdkData := s.makeSDKDataWithFlag("flag-key", 100, ldvalue.String("value"))
+			sdkData := s.makeSDKDataWithFlag(100, ldvalue.String("value"))
 			stream, configurers := s.setupDataSources(t, sdkData)
 			configurers = append(configurers, persistence)
 
@@ -515,7 +515,7 @@ func (s *ServerSidePersistentTests) Run(t *ldtest.T) {
 					})
 					persistence.SetCache(cacheConfig)
 
-					sdkData := s.makeSDKDataWithFlag("flag-key", 1, ldvalue.String("value"))
+					sdkData := s.makeSDKDataWithFlag(1, ldvalue.String("value"))
 					stream, configurers := s.setupDataSources(t, sdkData)
 					configurers = append(configurers, persistence)
 
@@ -544,7 +544,7 @@ func (s *ServerSidePersistentTests) Run(t *ldtest.T) {
 					})
 					persistence.SetCache(cacheConfig)
 
-					sdkData := s.makeSDKDataWithFlag("flag-key", 1, ldvalue.String("value"))
+					sdkData := s.makeSDKDataWithFlag(1, ldvalue.String("value"))
 					_, configurers := s.setupDataSources(t, sdkData)
 					configurers = append(configurers, persistence)
 
@@ -596,7 +596,7 @@ func (s *ServerSidePersistentTests) Run(t *ldtest.T) {
 					})
 					persistence.SetCache(cacheConfig)
 
-					sdkData := s.makeSDKDataWithFlag("flag-key", 1, ldvalue.String("value"))
+					sdkData := s.makeSDKDataWithFlag(1, ldvalue.String("value"))
 					_, configurers := s.setupDataSources(t, sdkData)
 					configurers = append(configurers, persistence)