chore: remove connector name in use backend check (#13895)

Author: Ella Rohm-Ensing

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

@@ -3,7 +3,6 @@
 package io.airbyte.connector_builder.handlers
 
 import io.airbyte.api.problems.model.generated.GithubContributionProblemData
-import io.airbyte.api.problems.throwable.generated.ConnectorImageNameInUseProblem
 import io.airbyte.api.problems.throwable.generated.GithubContributionFailedProblem
 import io.airbyte.api.problems.throwable.generated.InsufficientGithubTokenPermissionsProblem
 import io.airbyte.api.problems.throwable.generated.InvalidGithubTokenProblem
@@ -39,7 +38,7 @@ class ConnectorContributionHandler(
 
     // Check for existing connector
     val connectorExists = githubContributionService.checkIfConnectorExistsOnMain()
-    val connectorName = if (connectorExists) githubContributionService.readConnectorMetadataName() else null
+    val connectorName = githubContributionService.readConnectorMetadataValue("name")
     val connectorPath = if (connectorExists) "airbytehq/airbyte/tree/master/airbyte-integrations/connectors/${request.connectorImageName}" else null
 
     return CheckContributionRead().apply {
@@ -63,7 +62,7 @@ class ConnectorContributionHandler(
     connectorDescription: String,
     rawManifestYaml: String,
     baseImage: String,
-    actorDefinitionId: UUID,
+    actorDefinitionId: String,
     githubContributionService: GithubContributionService,
   ): Map<String, String> {
     val versionTag = "0.0.1"
@@ -93,7 +92,7 @@ class ConnectorContributionHandler(
       contributionTemplates.renderContributionMetadataYaml(
         connectorImageName = connectorImageName,
         connectorName = connectorName,
-        actorDefinitionId = actorDefinitionId.toString(),
+        actorDefinitionId = actorDefinitionId,
         versionTag = versionTag,
         baseImage = baseImage,
         // TODO: Parse Allowed Hosts from manifest
@@ -124,17 +123,11 @@ class ConnectorContributionHandler(
     val connectorImageName = generateContributionRequestBody.connectorImageName
 
     val githubContributionService = GithubContributionService(connectorImageName, githubToken)
-
-    // 0. Error if connector already exists
-    if (githubContributionService.checkIfConnectorExistsOnMain()) {
-      throw ConnectorImageNameInUseProblem()
-    }
+    val actorDefinitionId = githubContributionService.readConnectorMetadataValue("definitionId") ?: UUID.randomUUID().toString()
 
     // 1. Create a branch
     githubContributionService.prepareBranchForContribution()
 
-    val generatedActorDefinitionId = UUID.randomUUID()
-
     // 2. Generate Files
     val filesToCommit =
       createFileCommitMap(
@@ -143,7 +136,7 @@ class ConnectorContributionHandler(
         generateContributionRequestBody.description,
         generateContributionRequestBody.manifestYaml,
         generateContributionRequestBody.baseImage,
-        generatedActorDefinitionId,
+        actorDefinitionId,
         githubContributionService,
       )
 
@@ -156,7 +149,7 @@ class ConnectorContributionHandler(
     // 4. Create / update pull request
     val pullRequest = githubContributionService.getOrCreatePullRequest()
 
-    return GenerateContributionResponse().pullRequestUrl(pullRequest.htmlUrl.toString()).actorDefinitionId(generatedActorDefinitionId)
+    return GenerateContributionResponse().pullRequestUrl(pullRequest.htmlUrl.toString()).actorDefinitionId(UUID.fromString(actorDefinitionId))
   }
 
   fun convertGithubExceptionToContributionException(e: HttpException): Exception {

airbyte-connector-builder-server/src/main/kotlin/io/airbyte/connector_builder/services/GithubContributionService.kt

@@ -132,12 +132,15 @@ class GithubContributionService(var connectorImageName: String, personalAccessTo
     return yaml.load(rawYamlString)
   }
 
-  fun readConnectorMetadataName(): String? {
+/*
+ * Read a top-level field from the connector metadata
+ */
+  fun readConnectorMetadataValue(field: String): String? {
     val parsedYaml = readConnectorMetadata() ?: return null
 
-    // Extract "name" from the "data" section
+    // Extract a top-level field from the "data" section
     val dataSection = parsedYaml["data"] as? Map<*, *>
-    return dataSection?.get("name") as? String
+    return dataSection?.get(field) as? String
   }
 
   fun constructConnectorFilePath(fileName: String): String {

airbyte-connector-builder-server/src/test/kotlin/io/airbyte/connector_builder/handlers/ConnectorContributionHandlerTest.kt

@@ -33,7 +33,7 @@ class ConnectorContributionHandlerTest {
   @Test
   fun `returns details of an existing connector if found in target repository`() {
     every { anyConstructed<GithubContributionService>().checkIfConnectorExistsOnMain() } returns true
-    every { anyConstructed<GithubContributionService>().readConnectorMetadataName() } returns "Test Connector"
+    every { anyConstructed<GithubContributionService>().readConnectorMetadataValue("name") } returns "Test Connector"
 
     val response = connectorContributionHandler.checkContribution(requestBodyMock)