Add workspace ID to connector check calls to fix segment tracking (#1…

…7816)

* add workspace ID to source/dest check and discover endpoints

* pass workspaceId to API from frontend

* make it work for destinations too

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

@@ -2731,11 +2731,14 @@ components:
       required:
         - sourceDefinitionId
         - connectionConfiguration
+        - workspaceId
       properties:
         sourceDefinitionId:
           $ref: "#/components/schemas/SourceDefinitionId"
         connectionConfiguration:
           $ref: "#/components/schemas/SourceConfiguration"
+        workspaceId:
+          $ref: "#/components/schemas/WorkspaceId"
     SourceCreate:
       type: object
       required:
@@ -3027,6 +3030,8 @@ components:
           $ref: "#/components/schemas/DestinationDefinitionId"
         connectionConfiguration:
           $ref: "#/components/schemas/DestinationConfiguration"
+        workspaceId:
+          $ref: "#/components/schemas/WorkspaceId"
     DestinationCreate:
       type: object
       required:

airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java

@@ -146,7 +146,8 @@ public CheckConnectionRead checkSourceConnectionFromSourceCreate(final SourceCor
     // technically declared as required.
     final SourceConnection source = new SourceConnection()
         .withSourceDefinitionId(sourceConfig.getSourceDefinitionId())
-        .withConfiguration(partialConfig);
+        .withConfiguration(partialConfig)
+        .withWorkspaceId(sourceConfig.getWorkspaceId());
 
     final String imageName = DockerUtils.getTaggedImageName(sourceDef.getDockerRepository(), sourceDef.getDockerImageTag());
     return reportConnectionStatus(synchronousSchedulerClient.createSourceCheckConnectionJob(source, imageName));
@@ -186,7 +187,8 @@ public CheckConnectionRead checkDestinationConnectionFromDestinationCreate(final
     // technically declared as required.
     final DestinationConnection destination = new DestinationConnection()
         .withDestinationDefinitionId(destinationConfig.getDestinationDefinitionId())
-        .withConfiguration(partialConfig);
+        .withConfiguration(partialConfig)
+        .withWorkspaceId(destinationConfig.getWorkspaceId());
 
     final String imageName = DockerUtils.getTaggedImageName(destDef.getDockerRepository(), destDef.getDockerImageTag());
     return reportConnectionStatus(synchronousSchedulerClient.createDestinationCheckConnectionJob(destination, imageName));
@@ -250,7 +252,8 @@ public SourceDiscoverSchemaRead discoverSchemaForSourceFromSourceCreate(final So
     // technically declared as required.
     final SourceConnection source = new SourceConnection()
         .withSourceDefinitionId(sourceCreate.getSourceDefinitionId())
-        .withConfiguration(partialConfig);
+        .withConfiguration(partialConfig)
+        .withWorkspaceId(sourceCreate.getWorkspaceId());
     final SynchronousResponse<UUID> response = synchronousSchedulerClient.createDiscoverSchemaJob(source, imageName, sourceDef.getDockerImageTag());
     return retrieveDiscoveredSchema(response);
   }

airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java

@@ -189,7 +189,8 @@ void testCheckSourceConnectionFromSourceCreate() throws JsonValidationException,
 
     final SourceCoreConfig sourceCoreConfig = new SourceCoreConfig()
         .sourceDefinitionId(source.getSourceDefinitionId())
-        .connectionConfiguration(source.getConfiguration());
+        .connectionConfiguration(source.getConfiguration())
+        .workspaceId(source.getWorkspaceId());
 
     when(configRepository.getStandardSourceDefinition(source.getSourceDefinitionId()))
         .thenReturn(new StandardSourceDefinition()
@@ -505,7 +506,8 @@ void testDiscoverSchemaForSourceFromSourceCreate() throws JsonValidationExceptio
 
     final SourceCoreConfig sourceCoreConfig = new SourceCoreConfig()
         .sourceDefinitionId(source.getSourceDefinitionId())
-        .connectionConfiguration(source.getConfiguration());
+        .connectionConfiguration(source.getConfiguration())
+        .workspaceId(source.getWorkspaceId());
     final ActorCatalog actorCatalog = new ActorCatalog()
         .withCatalog(Jsons.jsonNode(airbyteCatalog))
         .withCatalogHash("")
@@ -538,7 +540,8 @@ void testDiscoverSchemaForSourceFromSourceCreateFailed() throws JsonValidationEx
 
     final SourceCoreConfig sourceCoreConfig = new SourceCoreConfig()
         .sourceDefinitionId(source.getSourceDefinitionId())
-        .connectionConfiguration(source.getConfiguration());
+        .connectionConfiguration(source.getConfiguration())
+        .workspaceId(source.getWorkspaceId());
 
     when(configRepository.getStandardSourceDefinition(source.getSourceDefinitionId()))
         .thenReturn(new StandardSourceDefinition()

airbyte-webapp/src/core/domain/connector/SourceService.ts

@@ -25,6 +25,7 @@ export class SourceService extends AirbyteRequestService {
     params: {
       sourceId?: string;
       connectionConfiguration?: ConnectionConfiguration;
+      workspaceId?: string;
     },
     requestParams?: RequestInit
   ) {

airbyte-webapp/src/hooks/services/useConnector.tsx

@@ -101,6 +101,7 @@ export type CheckConnectorParams = { signal: AbortSignal } & (
   | {
       selectedConnectorDefinitionId: string;
       connectionConfiguration: ConnectionConfiguration;
+      workspaceId: string;
     }
 );
 
@@ -119,6 +120,10 @@ export const useCheckConnector = (formType: "source" | "destination") => {
       payload.name = params.name;
     }
 
+    if ("workspaceId" in params) {
+      payload.workspaceId = params.workspaceId;
+    }
+
     if (formType === "destination") {
       if ("selectedConnectorId" in params) {
         payload.destinationId = params.selectedConnectorId;

airbyte-webapp/src/views/Connector/ConnectorCard/useTestConnector.tsx

@@ -3,6 +3,7 @@ import { useRef } from "react";
 import { ConnectorHelper } from "core/domain/connector";
 import { ConnectorT } from "core/domain/connector/types";
 import { CheckConnectorParams, useCheckConnector } from "hooks/services/useConnector";
+import { useCurrentWorkspace } from "services/workspaces/WorkspacesService";
 import { ServiceFormValues } from "views/Connector/ServiceForm";
 
 import { CheckConnectionRead } from "../../../core/request/AirbyteClient";
@@ -25,6 +26,7 @@ export const useTestConnector = (
   reset: () => void;
 } => {
   const { mutateAsync, isLoading, error, isSuccess, reset } = useCheckConnector(props.formType);
+  const workspace = useCurrentWorkspace();
 
   const abortControllerRef = useRef<AbortController | null>(null);
 
@@ -66,6 +68,7 @@ export const useTestConnector = (
           connectionConfiguration: values.connectionConfiguration,
           signal: controller.signal,
           selectedConnectorDefinitionId: values.serviceType,
+          workspaceId: workspace.workspaceId,
         };
       }
 

docs/reference/api/generated-api-html/index.html

@@ -10356,6 +10356,7 @@ <h3><a name="DestinationCoreConfig"><code>DestinationCoreConfig</code> - </a> <a
     <div class="field-items">
       <div class="param">destinationDefinitionId </div><div class="param-desc"><span class="param-type"><a href="#UUID">UUID</a></span>  format: uuid</div>
 <div class="param">connectionConfiguration </div><div class="param-desc"><span class="param-type"><a href="#DestinationConfiguration">DestinationConfiguration</a></span>  </div>
+<div class="param">workspaceId </div><div class="param-desc"><span class="param-type"><a href="#UUID">UUID</a></span>  format: uuid</div>
     </div>  <!-- field-items -->
   </div>
   <div class="model">
@@ -11017,6 +11018,7 @@ <h3><a name="SourceCoreConfig"><code>SourceCoreConfig</code> - </a> <a class="up
     <div class="field-items">
       <div class="param">sourceDefinitionId </div><div class="param-desc"><span class="param-type"><a href="#UUID">UUID</a></span>  format: uuid</div>
 <div class="param">connectionConfiguration </div><div class="param-desc"><span class="param-type"><a href="#SourceConfiguration">SourceConfiguration</a></span>  </div>
+<div class="param">workspaceId </div><div class="param-desc"><span class="param-type"><a href="#UUID">UUID</a></span>  format: uuid</div>
     </div>  <!-- field-items -->
   </div>
   <div class="model">