Skip to content

Commit 1a9f586

Browse files
josvazgjosvazg
authored
CLOUDP-328306: Find integration in replies (#2422)
1 parent 599a529 commit 1a9f586

File tree

3 files changed

+136
-29
lines changed

3 files changed

+136
-29
lines changed

‎internal/translation/thirdpartyintegration/conversion.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,17 @@ func fromAtlas(ai *admin.ThirdPartyIntegration) (*ThirdPartyIntegration, error)
330330
return tpi, nil
331331
}
332332

333+
func assertType(typeName string) error {
334+
switch typeName {
335+
case "DATADOG", "MICROSOFT_TEAMS", "NEW_RELIC",
336+
"OPS_GENIE", "PAGER_DUTY", "PROMETHEUS", "SLACK",
337+
"VICTOR_OPS", "WEBHOOK":
338+
return nil
339+
default:
340+
return fmt.Errorf("%w %v", ErrUnsupportedIntegrationType, typeName)
341+
}
342+
}
343+
333344
func isEnabled(field *string) bool {
334345
if field == nil {
335346
return false

‎internal/translation/thirdpartyintegration/thirdpartyintegration.go‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@ func (tpi *thirdPartyIntegration) Create(ctx context.Context, projectID string,
5858
if err != nil {
5959
return nil, fmt.Errorf("failed to create integration from config %v: %w", integration, err)
6060
}
61-
if len(integrationPages.GetResults()) != 1 {
62-
return nil, fmt.Errorf("expected an integration result reply but got %d", len(*integrationPages.Results))
63-
}
64-
65-
newIntegration, err := fromAtlas(&integrationPages.GetResults()[0])
61+
newIntegration, err := getResultOfType(integrationPages.GetResults(), integration.Type)
6662
if err != nil {
6763
return nil, fmt.Errorf("failed to convert integration from Atlas: %w", err)
6864
}
@@ -94,15 +90,11 @@ func (tpi *thirdPartyIntegration) Update(ctx context.Context, projectID string,
9490
if err != nil {
9591
return nil, fmt.Errorf("failed to update integration with config %v: %w", integration, err)
9692
}
97-
if len(integrationPages.GetResults()) != 1 {
98-
return nil, fmt.Errorf("expected an integration result reply but got %d", len(*integrationPages.Results))
99-
}
100-
101-
newIntegration, err := fromAtlas(&integrationPages.GetResults()[0])
93+
updatedIntegration, err := getResultOfType(integrationPages.GetResults(), integration.Type)
10294
if err != nil {
10395
return nil, fmt.Errorf("failed to convert integration from Atlas: %w", err)
10496
}
105-
return newIntegration, nil
97+
return updatedIntegration, nil
10698
}
10799

108100
func (tpi *thirdPartyIntegration) Delete(ctx context.Context, projectID, integrationType string) error {
@@ -115,3 +107,19 @@ func (tpi *thirdPartyIntegration) Delete(ctx context.Context, projectID, integra
115107
}
116108
return nil
117109
}
110+
111+
func getResultOfType(integrations []admin.ThirdPartyIntegration, typeName string) (*ThirdPartyIntegration, error) {
112+
if err := assertType(typeName); err != nil {
113+
return nil, fmt.Errorf("wrong target type: %w", err)
114+
}
115+
for _, integration := range integrations {
116+
tn := integration.GetType()
117+
if err := assertType(tn); err != nil {
118+
return nil, fmt.Errorf("wrong result type: %w", err)
119+
}
120+
if tn == typeName {
121+
return fromAtlas(&integration)
122+
}
123+
}
124+
return nil, fmt.Errorf("integration %q %w in API reply", typeName, ErrNotFound)
125+
}

‎internal/translation/thirdpartyintegration/thirdpartyintegration_test.go‎

Lines changed: 106 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ const (
3535

3636
testID = "fake-id"
3737

38+
testID2 = "fake-id-2"
39+
3840
testRegion = "fake-region"
3941

4042
testIntegrationType = "PAGER_DUTY"
@@ -79,12 +81,14 @@ func TestIntegrationsCreate(t *testing.T) {
7981
},
8082
},
8183
api: testCreateIntegrationAPI(
82-
&admin.ThirdPartyIntegration{
83-
Id: pointer.MakePtr(string(testID)),
84-
Type: pointer.MakePtr("DATADOG"),
85-
ApiKey: pointer.MakePtr(testAPIKey),
86-
Region: pointer.MakePtr(string(testRegion)),
87-
SendCollectionLatencyMetrics: pointer.MakePtr(true),
84+
[]admin.ThirdPartyIntegration{
85+
{
86+
Id: pointer.MakePtr(string(testID)),
87+
Type: pointer.MakePtr("DATADOG"),
88+
ApiKey: pointer.MakePtr(testAPIKey),
89+
Region: pointer.MakePtr(string(testRegion)),
90+
SendCollectionLatencyMetrics: pointer.MakePtr(true),
91+
},
8892
},
8993
nil,
9094
),
@@ -163,18 +167,106 @@ func TestIntegrationsCreate(t *testing.T) {
163167
},
164168
},
165169
api: testCreateIntegrationAPI(
166-
&admin.ThirdPartyIntegration{
167-
Id: pointer.MakePtr(string(testID)),
168-
Type: pointer.MakePtr("BLAH"),
169-
ApiKey: pointer.MakePtr(testAPIKey),
170-
Region: pointer.MakePtr(string(testRegion)),
171-
SendCollectionLatencyMetrics: pointer.MakePtr(true),
170+
[]admin.ThirdPartyIntegration{
171+
{
172+
Id: pointer.MakePtr(string(testID)),
173+
Type: pointer.MakePtr("BLAH"),
174+
ApiKey: pointer.MakePtr(testAPIKey),
175+
Region: pointer.MakePtr(string(testRegion)),
176+
SendCollectionLatencyMetrics: pointer.MakePtr(true),
177+
},
172178
},
173179
nil,
174180
),
175181
expected: nil,
176182
expectedError: integration.ErrUnsupportedIntegrationType,
177183
},
184+
185+
{
186+
title: "failure to extract matching type from API reply",
187+
integration: &integration.ThirdPartyIntegration{
188+
AtlasThirdPartyIntegrationSpec: akov2.AtlasThirdPartyIntegrationSpec{
189+
Type: "DATADOG",
190+
Datadog: &akov2.DatadogIntegration{
191+
Region: testRegion,
192+
SendCollectionLatencyMetrics: pointer.MakePtr("enabled"),
193+
SendDatabaseMetrics: pointer.MakePtr("disabled"),
194+
},
195+
},
196+
DatadogSecrets: &integration.DatadogSecrets{
197+
APIKey: testAPIKey,
198+
},
199+
},
200+
api: testCreateIntegrationAPI(
201+
[]admin.ThirdPartyIntegration{
202+
{
203+
Id: pointer.MakePtr(string(testID)),
204+
Type: pointer.MakePtr("SLACK"),
205+
ApiToken: pointer.MakePtr("fake-token"),
206+
ChannelName: pointer.MakePtr("channel"),
207+
TeamName: pointer.MakePtr("team"),
208+
},
209+
{
210+
Id: pointer.MakePtr(string(testID2)),
211+
Type: pointer.MakePtr("WEBHOOK"),
212+
Url: pointer.MakePtr("http://example.com/fake"),
213+
},
214+
},
215+
nil,
216+
),
217+
expected: nil,
218+
expectedError: integration.ErrNotFound,
219+
},
220+
221+
{
222+
title: "extracts matching type from API reply",
223+
integration: &integration.ThirdPartyIntegration{
224+
AtlasThirdPartyIntegrationSpec: akov2.AtlasThirdPartyIntegrationSpec{
225+
Type: "DATADOG",
226+
Datadog: &akov2.DatadogIntegration{
227+
Region: testRegion,
228+
SendCollectionLatencyMetrics: pointer.MakePtr("enabled"),
229+
SendDatabaseMetrics: pointer.MakePtr("disabled"),
230+
},
231+
},
232+
DatadogSecrets: &integration.DatadogSecrets{
233+
APIKey: testAPIKey,
234+
},
235+
},
236+
api: testCreateIntegrationAPI(
237+
[]admin.ThirdPartyIntegration{
238+
{
239+
Id: pointer.MakePtr(string(testID)),
240+
Type: pointer.MakePtr("SLACK"),
241+
ApiToken: pointer.MakePtr("fake-token"),
242+
ChannelName: pointer.MakePtr("channel"),
243+
TeamName: pointer.MakePtr("team"),
244+
},
245+
{
246+
Id: pointer.MakePtr(string(testID2)),
247+
Type: pointer.MakePtr("DATADOG"),
248+
SendCollectionLatencyMetrics: pointer.MakePtr(false),
249+
SendDatabaseMetrics: pointer.MakePtr(true),
250+
ApiKey: pointer.MakePtr(testAPIKey),
251+
},
252+
},
253+
nil,
254+
),
255+
expected: &integration.ThirdPartyIntegration{
256+
ID: testID2,
257+
AtlasThirdPartyIntegrationSpec: akov2.AtlasThirdPartyIntegrationSpec{
258+
Type: "DATADOG",
259+
Datadog: &akov2.DatadogIntegration{
260+
SendCollectionLatencyMetrics: pointer.MakePtr("disabled"),
261+
SendDatabaseMetrics: pointer.MakePtr("enabled"),
262+
},
263+
},
264+
DatadogSecrets: &integration.DatadogSecrets{
265+
APIKey: testAPIKey,
266+
},
267+
},
268+
expectedError: nil,
269+
},
178270
} {
179271
ctx := context.Background()
180272
t.Run(tc.title, func(t *testing.T) {
@@ -410,19 +502,15 @@ func TestIntegrationDelete(t *testing.T) {
410502
}
411503
}
412504

413-
func testCreateIntegrationAPI(integration *admin.ThirdPartyIntegration, err error) admin.ThirdPartyIntegrationsApi {
505+
func testCreateIntegrationAPI(integrations []admin.ThirdPartyIntegration, err error) admin.ThirdPartyIntegrationsApi {
414506
var apiMock mockadmin.ThirdPartyIntegrationsApi
415507

416508
apiMock.EXPECT().CreateThirdPartyIntegration(
417509
mock.Anything, mock.Anything, testProjectID, mock.Anything,
418510
).Return(admin.CreateThirdPartyIntegrationApiRequest{ApiService: &apiMock})
419511

420512
paginatedIntegration := &admin.PaginatedIntegration{}
421-
if integration != nil {
422-
paginatedIntegration.Results = &[]admin.ThirdPartyIntegration{
423-
*integration,
424-
}
425-
}
513+
paginatedIntegration.Results = &integrations
426514
apiMock.EXPECT().CreateThirdPartyIntegrationExecute(
427515
mock.AnythingOfType("admin.CreateThirdPartyIntegrationApiRequest"),
428516
).Return(paginatedIntegration, nil, err)

0 commit comments

Comments
 (0)