diff --git a/lib/web/ui/integration_test.go b/lib/web/ui/integration_test.go index c213835a801f2..f10594a028489 100644 --- a/lib/web/ui/integration_test.go +++ b/lib/web/ui/integration_test.go @@ -45,6 +45,7 @@ func TestMakeIntegration(t *testing.T) { Organization: "my-org", }, ) + require.NoError(t, err) testCases := []struct { integration types.Integration diff --git a/web/packages/teleport/src/services/integrations/integrations.test.ts b/web/packages/teleport/src/services/integrations/integrations.test.ts index 9dde80c008362..fb917c96a6b97 100644 --- a/web/packages/teleport/src/services/integrations/integrations.test.ts +++ b/web/packages/teleport/src/services/integrations/integrations.test.ts @@ -99,7 +99,8 @@ test('fetch integration list: fetchIntegrations()', async () => { name: 'github-my-org', resourceType: 'integration', spec: { - organization: 'my-org', + roleArn: undefined, + audience: undefined, }, details: 'GitHub Organization "my-org"', statusCode: IntegrationStatusCode.Running, diff --git a/web/packages/teleport/src/services/integrations/integrations.ts b/web/packages/teleport/src/services/integrations/integrations.ts index eac6eecd220a9..dfdb2e0ad347b 100644 --- a/web/packages/teleport/src/services/integrations/integrations.ts +++ b/web/packages/teleport/src/services/integrations/integrations.ts @@ -432,7 +432,6 @@ function makeIntegration(json: any): Integration { issuerS3Bucket: awsoidc?.issuerS3Bucket, issuerS3Prefix: awsoidc?.issuerS3Prefix, audience: awsoidc?.audience, - organization: github?.organization, }, details: github ? `GitHub Organization "${github.organization}"` diff --git a/web/packages/teleport/src/services/integrations/types.ts b/web/packages/teleport/src/services/integrations/types.ts index 9af7908cc2f2f..ccc795fe887cd 100644 --- a/web/packages/teleport/src/services/integrations/types.ts +++ b/web/packages/teleport/src/services/integrations/types.ts @@ -44,9 +44,7 @@ import { Node } from '../nodes'; export type Integration< T extends string = 'integration', K extends string = IntegrationKind, - SP extends Record = - | IntegrationSpecAwsOidc - | IntegrationSpecGitHub, + SP extends Record = IntegrationSpecAwsOidc, SD extends Record = null, > = { resourceType: T; @@ -720,7 +718,3 @@ export type AwsDatabaseVpcsResponse = { vpcs: Vpc[]; nextToken: string; }; - -export type IntegrationSpecGitHub = { - organization: string; -};