Skip to content

Commit 047101e

Browse files
feat: add EAI flags to extra response data (#43)
1 parent 39691d5 commit 047101e

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.23.3
44

55
require (
66
github.com/aws/aws-sdk-go v1.40.45
7-
github.com/flagship-io/flagship-common v0.0.21
8-
github.com/flagship-io/flagship-proto v0.0.23
7+
github.com/flagship-io/flagship-common v0.0.23
8+
github.com/flagship-io/flagship-proto v0.0.24
99
github.com/go-kit/kit v0.12.0
1010
github.com/go-redis/redis/v8 v8.11.4
1111
github.com/sirupsen/logrus v1.9.3

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
7575
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
7676
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
7777
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
78-
github.com/flagship-io/flagship-common v0.0.21 h1:NZzdNVEt8hCtYGVxcpk8jxaqUuzA+b9ZOhMTEfF1udQ=
79-
github.com/flagship-io/flagship-common v0.0.21/go.mod h1:YGlDzICSf7Oav2W+/jy3xXqjILtk/6R1wFAfRkwrBLI=
80-
github.com/flagship-io/flagship-proto v0.0.23 h1:xt8SHsoLZwL0Bca1+tRrppCglUm+m/2f42tiUQUovn0=
81-
github.com/flagship-io/flagship-proto v0.0.23/go.mod h1:wmNh0bk497tmdkyiqk0iWMsohcw32cBIpJzNb4RI2S8=
78+
github.com/flagship-io/flagship-common v0.0.23 h1:7VFL13abw7SGOidA2U8q1+tag/fKpRlK9/cnJA79uOY=
79+
github.com/flagship-io/flagship-common v0.0.23/go.mod h1:BozH62CH7iYmQcxgnjpX5qAAtSbNJVzWenPIKDrrVTI=
80+
github.com/flagship-io/flagship-proto v0.0.24 h1:54wAOEo7xVsGumXkHTAQBs1vBXkcm4IJ5FJHIre4+w4=
81+
github.com/flagship-io/flagship-proto v0.0.24/go.mod h1:wmNh0bk497tmdkyiqk0iWMsohcw32cBIpJzNb4RI2S8=
8282
github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
8383
github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
8484
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

pkg/connectors/environment_loaders/cdn.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,14 @@ func (l *CDNLoader) fetchEnvironment(envID string, APIKey string) error {
136136
l.lock.Lock()
137137
l.loadedEnvironment = &models.Environment{
138138
Common: &common.Environment{
139-
ID: envID,
140-
Campaigns: campaigns,
141-
IsPanic: conf.Panic,
142-
SingleAssignment: conf.AccountSettings.Enabled1V1T,
143-
UseReconciliation: conf.AccountSettings.EnabledXPC || conf.VisitorConsolidation,
144-
CacheEnabled: true,
139+
ID: envID,
140+
Campaigns: campaigns,
141+
IsPanic: conf.Panic,
142+
SingleAssignment: conf.AccountSettings.Enabled1V1T,
143+
UseReconciliation: conf.AccountSettings.EnabledXPC || conf.VisitorConsolidation,
144+
EaiCollectEnabled: conf.AccountSettings.EaiCollectEnabled,
145+
EaiActivationEnabled: conf.AccountSettings.EaiActivationEnabled,
146+
CacheEnabled: true,
145147
},
146148
HasIntegrations: false,
147149
}

pkg/handlers/campaigns.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ func Campaigns(context *connectors.DecisionContext) func(http.ResponseWriter, *h
3737

3838
func toAccountSettings(e *models.Environment) *decision_response.AccountSettings {
3939
return &decision_response.AccountSettings{
40-
EnabledXPC: e.Common.UseReconciliation,
41-
Enabled1V1T: e.Common.SingleAssignment,
42-
Troubleshooting: e.Common.Troubleshooting,
40+
EnabledXPC: e.Common.UseReconciliation,
41+
Enabled1V1T: e.Common.SingleAssignment,
42+
EaiCollectEnabled: e.Common.EaiCollectEnabled,
43+
EaiActivationEnabled: e.Common.EaiActivationEnabled,
44+
Troubleshooting: e.Common.Troubleshooting,
4345
}
4446
}
4547

0 commit comments

Comments
 (0)