Skip to content

Commit 3cf3aa5

Browse files
author
Ella Rohm-Ensing
committed
feat: return actor definition id from /contribute/generate (#13665)
1 parent 568839c commit 3cf3aa5

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

airbyte-connector-builder-server/src/main/kotlin/io/airbyte/connector_builder/handlers/ConnectorContributionHandler.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class ConnectorContributionHandler(
6363
connectorDescription: String,
6464
rawManifestYaml: String,
6565
baseImage: String,
66+
actorDefinitionId: UUID,
6667
githubContributionService: GithubContributionService,
6768
): Map<String, String> {
6869
val versionTag = "0.0.1"
@@ -92,7 +93,7 @@ class ConnectorContributionHandler(
9293
contributionTemplates.renderContributionMetadataYaml(
9394
connectorImageName = connectorImageName,
9495
connectorName = connectorName,
95-
actorDefinitionId = UUID.randomUUID().toString(),
96+
actorDefinitionId = actorDefinitionId.toString(),
9697
versionTag = versionTag,
9798
baseImage = baseImage,
9899
// TODO: Parse Allowed Hosts from manifest
@@ -132,6 +133,8 @@ class ConnectorContributionHandler(
132133
// 1. Create a branch
133134
githubContributionService.prepareBranchForContribution()
134135

136+
val generatedActorDefinitionId = UUID.randomUUID()
137+
135138
// 2. Generate Files
136139
val filesToCommit =
137140
createFileCommitMap(
@@ -140,6 +143,7 @@ class ConnectorContributionHandler(
140143
generateContributionRequestBody.description,
141144
generateContributionRequestBody.manifestYaml,
142145
generateContributionRequestBody.baseImage,
146+
generatedActorDefinitionId,
143147
githubContributionService,
144148
)
145149

@@ -152,7 +156,7 @@ class ConnectorContributionHandler(
152156
// 4. Create / update pull request
153157
val pullRequest = githubContributionService.getOrCreatePullRequest()
154158

155-
return GenerateContributionResponse().pullRequestUrl(pullRequest.htmlUrl.toString())
159+
return GenerateContributionResponse().pullRequestUrl(pullRequest.htmlUrl.toString()).actorDefinitionId(generatedActorDefinitionId)
156160
}
157161

158162
fun convertGithubExceptionToContributionException(e: HttpException): Exception {

airbyte-connector-builder-server/src/main/openapi/openapi.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,15 @@ components:
206206
type: object
207207
required:
208208
- pull_request_url
209+
- actor_definition_id
209210
properties:
210211
pull_request_url:
211212
type: string
212213
description: URL of the PR that was created or updated
214+
actor_definition_id:
215+
type: string
216+
format: UUID
217+
description: The definition ID of the connector that was contributed to
213218
StreamRead:
214219
type: object
215220
required:

0 commit comments

Comments
 (0)