Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/actions/contract-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ inputs:
required: false
default: ''
run_fdv2_tests:
description: 'Whether to run contract tests from the feat/fdv2 branch'
description: 'Whether to run contract tests from the v3.0.0-alpha.3 tag'
required: false
default: 'false'

Expand Down Expand Up @@ -64,15 +64,15 @@ runs:
shell: bash
run: dotnet ${{ inputs.service_dll_file }} > test-service.log 2>&1 & disown

- name: Clone and run contract tests from feat/fdv2 branch
- name: Clone and run contract tests from v3.0.0-alpha.3 tag
if: inputs.run_fdv2_tests == 'true'
shell: bash
run: |
mkdir -p /tmp/sdk-test-harness
git clone https://github.com/launchdarkly/sdk-test-harness.git /tmp/sdk-test-harness
cp $(dirname ./${{ inputs.service_project_file }})/test-supressions-fdv2.txt /tmp/sdk-test-harness/testharness-suppressions-fdv2.txt
cd /tmp/sdk-test-harness
git checkout feat/fdv2
git checkout v3.0.0-alpha.3
go build -o test-harness .
./test-harness -url http://localhost:8000 -debug -status-timeout=360 --skip-from=testharness-suppressions-fdv2.txt --stop-service-at-end
env:
Expand Down
10 changes: 2 additions & 8 deletions pkgs/sdk/server/contract-tests/Representations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public class SdkConfigDataSystemParams
public SdkConfigDataStoreParams Store { get; set; }
public int? StoreMode { get; set; }
public SdkConfigDataInitializerParams[] Initializers { get; set; }
public SdkConfigSynchronizersParams Synchronizers { get; set; }
public SdkConfigDataSynchronizerParams[] Synchronizers { get; set; }
public string PayloadFilter { get; set; }
}

Expand Down Expand Up @@ -185,13 +185,7 @@ public class SdkConfigDataInitializerParams
public SdkConfigPollingParams Polling { get; set; }
}

public class SdkConfigSynchronizersParams
{
public SdkConfigSynchronizerParams Primary { get; set; }
public SdkConfigSynchronizerParams Secondary { get; set; }
}

public class SdkConfigSynchronizerParams
public class SdkConfigDataSynchronizerParams
{
public SdkConfigStreamingParams Streaming { get; set; }
public SdkConfigPollingParams Polling { get; set; }
Expand Down
50 changes: 19 additions & 31 deletions pkgs/sdk/server/contract-tests/SdkClientEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -487,27 +487,16 @@ private static Configuration BuildSdkConfig(SdkConfigParams sdkParams, ILogAdapt
}

// Configure synchronizers
if (sdkParams.DataSystem.Synchronizers != null)
if (sdkParams.DataSystem.Synchronizers != null && sdkParams.DataSystem.Synchronizers.Length > 0)
{
var synchronizers = new List<IComponentConfigurer<IDataSource>>();

// Primary synchronizer
if (sdkParams.DataSystem.Synchronizers.Primary != null)
foreach (var synchronizerParams in sdkParams.DataSystem.Synchronizers)
{
var primary = CreateSynchronizer(sdkParams.DataSystem.Synchronizers.Primary, sdkParams.DataSystem.PayloadFilter);
if (primary != null)
var synchronizer = CreateSynchronizer(synchronizerParams, sdkParams.DataSystem.PayloadFilter);
if (synchronizer != null)
{
synchronizers.Add(primary);
}
}

// Secondary synchronizer (optional)
if (sdkParams.DataSystem.Synchronizers.Secondary != null)
{
var secondary = CreateSynchronizer(sdkParams.DataSystem.Synchronizers.Secondary, sdkParams.DataSystem.PayloadFilter);
if (secondary != null)
{
synchronizers.Add(secondary);
synchronizers.Add(synchronizer);
}
}

Expand All @@ -517,23 +506,22 @@ private static Configuration BuildSdkConfig(SdkConfigParams sdkParams, ILogAdapt

// Find the best synchronizer to use for FDv1 fallback configuration
// Prefer polling synchronizers since FDv1 fallback is polling-based
SdkConfigSynchronizerParams synchronizerForFallback = null;
SdkConfigDataSynchronizerParams synchronizerForFallback = null;

// First, try to find a polling synchronizer (check secondary first, then primary)
if (sdkParams.DataSystem.Synchronizers.Secondary != null &&
sdkParams.DataSystem.Synchronizers.Secondary.Polling != null)
// First, try to find a polling synchronizer
foreach (var syncParams in sdkParams.DataSystem.Synchronizers)
{
synchronizerForFallback = sdkParams.DataSystem.Synchronizers.Secondary;
}
else if (sdkParams.DataSystem.Synchronizers.Primary != null &&
sdkParams.DataSystem.Synchronizers.Primary.Polling != null)
{
synchronizerForFallback = sdkParams.DataSystem.Synchronizers.Primary;
if (syncParams.Polling != null)
{
synchronizerForFallback = syncParams;
break;
}
}
// If no polling synchronizer found, use primary synchronizer (could be streaming)
else if (sdkParams.DataSystem.Synchronizers.Primary != null)

// If no polling synchronizer found, use the first synchronizer (could be streaming)
if (synchronizerForFallback == null && sdkParams.DataSystem.Synchronizers.Length > 0)
{
synchronizerForFallback = sdkParams.DataSystem.Synchronizers.Primary;
synchronizerForFallback = sdkParams.DataSystem.Synchronizers[0];
}

if (synchronizerForFallback != null)
Expand Down Expand Up @@ -563,7 +551,7 @@ private static Configuration BuildSdkConfig(SdkConfigParams sdkParams, ILogAdapt
}

private static IComponentConfigurer<IDataSource> CreateSynchronizer(
SdkConfigSynchronizerParams synchronizer,
SdkConfigDataSynchronizerParams synchronizer,
string payloadFilter)
{
if (synchronizer.Polling != null)
Expand Down Expand Up @@ -608,7 +596,7 @@ private static IComponentConfigurer<IDataSource> CreateSynchronizer(
}

private static IComponentConfigurer<IDataSource> CreateFDv1FallbackSynchronizer(
SdkConfigSynchronizerParams synchronizer)
SdkConfigDataSynchronizerParams synchronizer)
{
// FDv1 fallback synchronizer is always polling-based
var fdv1PollingBuilder = DataSystemComponents.FDv1Polling();
Expand Down
Loading