Skip to content

Commit 202ee5d

Browse files
committed
chore(airbyte-server): expose connector config updated in check output (#18030)
1 parent 0f9a9d8 commit 202ee5d

File tree

5 files changed

+16
-0
lines changed

5 files changed

+16
-0
lines changed

airbyte-api/server-api/src/main/openapi/config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6803,6 +6803,8 @@ paths:
68036803
status:
68046804
type: string
68056805
enum: [succeeded, failed]
6806+
connectorConfigurationUpdated:
6807+
type: boolean
68066808
message:
68076809
type: string
68086810
failureReason:

airbyte-server/src/main/kotlin/io/airbyte/server/apis/controllers/CommandApiController.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ class CommandApiController(
111111
id(checkCommandOutputRequest.id)
112112
output?.let {
113113
status(it.status.toApi())
114+
connectorConfigurationUpdated(it.connectorConfigUpdated)
114115
message(it.message)
115116
failureReason(apiPojoConverters.failureReasonToApi(it.failureReason))
116117
logs(output.logs?.toApi())

airbyte-server/src/main/kotlin/io/airbyte/server/services/CommandService.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,7 @@ class CommandService(
679679
}?.let { jobOutput ->
680680
return CheckJobOutput(
681681
status = jobOutput.checkConnection.status,
682+
connectorConfigUpdated = jobOutput.connectorConfigurationUpdated ?: false,
682683
message = jobOutput.checkConnection?.message,
683684
failureReason = jobOutput.failureReason,
684685
logs = if (withLogs) getJobLogs(commandId) else null,
@@ -702,6 +703,7 @@ class CommandService(
702703

703704
data class CheckJobOutput(
704705
val status: StandardCheckConnectionOutput.Status,
706+
val connectorConfigUpdated: Boolean,
705707
val message: String?,
706708
val failureReason: FailureReason?,
707709
val logs: JobLogs?,

airbyte-server/src/test/kotlin/io/airbyte/server/apis/controllers/CommandApiControllerTest.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,14 @@ class CommandApiControllerTest {
148148
every { commandService.getCheckJobOutput(TEST_COMMAND_ID, any()) } returns
149149
CommandService.CheckJobOutput(
150150
status = StandardCheckConnectionOutput.Status.SUCCEEDED,
151+
connectorConfigUpdated = false,
151152
message = "",
152153
failureReason = null,
153154
logs = null,
154155
)
155156

156157
val output = controller.getCheckCommandOutput(CheckCommandOutputRequest().id(TEST_COMMAND_ID))
158+
assertEquals(false, output.connectorConfigurationUpdated)
157159
assertEquals(TEST_COMMAND_ID, output.id)
158160
assertEquals(CheckCommandOutputResponse.StatusEnum.SUCCEEDED, output.status)
159161
assertEquals(null, output.logs)
@@ -166,6 +168,7 @@ class CommandApiControllerTest {
166168
every { commandService.getCheckJobOutput(TEST_COMMAND_ID, any()) } returns
167169
CommandService.CheckJobOutput(
168170
status = StandardCheckConnectionOutput.Status.FAILED,
171+
connectorConfigUpdated = false,
169172
message = message,
170173
failureReason = null,
171174
logs = null,
@@ -175,6 +178,7 @@ class CommandApiControllerTest {
175178
assertEquals(
176179
CheckCommandOutputResponse()
177180
.id(TEST_COMMAND_ID)
181+
.connectorConfigurationUpdated(false)
178182
.status(CheckCommandOutputResponse.StatusEnum.FAILED)
179183
.message(message),
180184
output,
@@ -187,6 +191,7 @@ class CommandApiControllerTest {
187191
every { commandService.getCheckJobOutput(TEST_COMMAND_ID, any()) } returns
188192
CommandService.CheckJobOutput(
189193
status = StandardCheckConnectionOutput.Status.FAILED,
194+
connectorConfigUpdated = true,
190195
message = "",
191196
failureReason =
192197
FailureReason()
@@ -202,6 +207,7 @@ class CommandApiControllerTest {
202207

203208
val output = controller.getCheckCommandOutput(CheckCommandOutputRequest().id(TEST_COMMAND_ID))
204209
assertEquals(TEST_COMMAND_ID, output.id)
210+
assertEquals(true, output.connectorConfigurationUpdated)
205211
assertEquals(CheckCommandOutputResponse.StatusEnum.FAILED, output.status)
206212
assertEquals(
207213
ApiFailureReason()
@@ -576,6 +582,7 @@ class CommandApiControllerTest {
576582
every { commandService.getCheckJobOutput(TEST_COMMAND_ID, withLogs = true) } returns
577583
CommandService.CheckJobOutput(
578584
status = StandardCheckConnectionOutput.Status.SUCCEEDED,
585+
connectorConfigUpdated = false,
579586
message = "",
580587
failureReason = null,
581588
logs = CommandService.JobLogs.createStructuredLogs(logEvents),
@@ -602,6 +609,7 @@ class CommandApiControllerTest {
602609
every { commandService.getCheckJobOutput(TEST_COMMAND_ID, withLogs = true) } returns
603610
CommandService.CheckJobOutput(
604611
status = StandardCheckConnectionOutput.Status.SUCCEEDED,
612+
connectorConfigUpdated = false,
605613
message = "",
606614
failureReason = null,
607615
logs = CommandService.JobLogs.createFormattedLogs(logLines),
@@ -621,6 +629,7 @@ class CommandApiControllerTest {
621629
every { commandService.getCheckJobOutput(TEST_COMMAND_ID, withLogs = false) } returns
622630
CommandService.CheckJobOutput(
623631
status = StandardCheckConnectionOutput.Status.SUCCEEDED,
632+
connectorConfigUpdated = false,
624633
message = "",
625634
failureReason = null,
626635
logs = null,

airbyte-server/src/test/kotlin/io/airbyte/server/services/CommandServiceTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ class CommandServiceTest {
370370
val connectorOutput =
371371
ConnectorJobOutput()
372372
.withOutputType(OutputType.CHECK_CONNECTION)
373+
.withConnectorConfigurationUpdated(true)
373374
.withCheckConnection(
374375
StandardCheckConnectionOutput()
375376
.withStatus(StandardCheckConnectionOutput.Status.SUCCEEDED)
@@ -381,6 +382,7 @@ class CommandServiceTest {
381382
val expectedOutput =
382383
CommandService.CheckJobOutput(
383384
status = StandardCheckConnectionOutput.Status.SUCCEEDED,
385+
connectorConfigUpdated = true,
384386
message = "Success",
385387
failureReason = null,
386388
logs = null,

0 commit comments

Comments
 (0)