mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-09-22 13:39:35 +00:00
Add Humanitec secret sync integration
This commit is contained in:
@@ -1771,6 +1771,11 @@ export const SecretSyncs = {
|
|||||||
},
|
},
|
||||||
DATABRICKS: {
|
DATABRICKS: {
|
||||||
scope: "The Databricks secret scope that secrets should be synced to."
|
scope: "The Databricks secret scope that secrets should be synced to."
|
||||||
|
},
|
||||||
|
HUMANITEC: {
|
||||||
|
app: "The ID of the Humanitec app to sync secrets to.",
|
||||||
|
org: "The ID of the Humanitec org to sync secrets to.",
|
||||||
|
env: "The ID of the Humanitec environment to sync secrets to."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -224,6 +224,9 @@ const envSchema = z
|
|||||||
DATADOG_SERVICE: zpStr(z.string().optional().default("infisical-core")),
|
DATADOG_SERVICE: zpStr(z.string().optional().default("infisical-core")),
|
||||||
DATADOG_HOSTNAME: zpStr(z.string().optional()),
|
DATADOG_HOSTNAME: zpStr(z.string().optional()),
|
||||||
|
|
||||||
|
// humanitec
|
||||||
|
INF_APP_CONNECTION_HUMANITEC_ACCESS_KEY: zpStr(z.string().optional()),
|
||||||
|
|
||||||
/* CORS ----------------------------------------------------------------------------- */
|
/* CORS ----------------------------------------------------------------------------- */
|
||||||
|
|
||||||
CORS_ALLOWED_ORIGINS: zpStr(
|
CORS_ALLOWED_ORIGINS: zpStr(
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ import {
|
|||||||
} from "@app/services/app-connection/databricks";
|
} from "@app/services/app-connection/databricks";
|
||||||
import { GcpConnectionListItemSchema, SanitizedGcpConnectionSchema } from "@app/services/app-connection/gcp";
|
import { GcpConnectionListItemSchema, SanitizedGcpConnectionSchema } from "@app/services/app-connection/gcp";
|
||||||
import { GitHubConnectionListItemSchema, SanitizedGitHubConnectionSchema } from "@app/services/app-connection/github";
|
import { GitHubConnectionListItemSchema, SanitizedGitHubConnectionSchema } from "@app/services/app-connection/github";
|
||||||
|
import {
|
||||||
|
HumanitecConnectionListItemSchema,
|
||||||
|
SanitizedHumanitecConnectionSchema
|
||||||
|
} from "@app/services/app-connection/humanitec";
|
||||||
import { AuthMode } from "@app/services/auth/auth-type";
|
import { AuthMode } from "@app/services/auth/auth-type";
|
||||||
|
|
||||||
// can't use discriminated due to multiple schemas for certain apps
|
// can't use discriminated due to multiple schemas for certain apps
|
||||||
@@ -27,7 +31,8 @@ const SanitizedAppConnectionSchema = z.union([
|
|||||||
...SanitizedGcpConnectionSchema.options,
|
...SanitizedGcpConnectionSchema.options,
|
||||||
...SanitizedAzureKeyVaultConnectionSchema.options,
|
...SanitizedAzureKeyVaultConnectionSchema.options,
|
||||||
...SanitizedAzureAppConfigurationConnectionSchema.options,
|
...SanitizedAzureAppConfigurationConnectionSchema.options,
|
||||||
...SanitizedDatabricksConnectionSchema.options
|
...SanitizedDatabricksConnectionSchema.options,
|
||||||
|
...SanitizedHumanitecConnectionSchema.options
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const AppConnectionOptionsSchema = z.discriminatedUnion("app", [
|
const AppConnectionOptionsSchema = z.discriminatedUnion("app", [
|
||||||
@@ -36,7 +41,8 @@ const AppConnectionOptionsSchema = z.discriminatedUnion("app", [
|
|||||||
GcpConnectionListItemSchema,
|
GcpConnectionListItemSchema,
|
||||||
AzureKeyVaultConnectionListItemSchema,
|
AzureKeyVaultConnectionListItemSchema,
|
||||||
AzureAppConfigurationConnectionListItemSchema,
|
AzureAppConfigurationConnectionListItemSchema,
|
||||||
DatabricksConnectionListItemSchema
|
DatabricksConnectionListItemSchema,
|
||||||
|
HumanitecConnectionListItemSchema
|
||||||
]);
|
]);
|
||||||
|
|
||||||
export const registerAppConnectionRouter = async (server: FastifyZodProvider) => {
|
export const registerAppConnectionRouter = async (server: FastifyZodProvider) => {
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
import z from "zod";
|
||||||
|
|
||||||
|
import { readLimit } from "@app/server/config/rateLimiter";
|
||||||
|
import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
|
||||||
|
import { AppConnection } from "@app/services/app-connection/app-connection-enums";
|
||||||
|
import {
|
||||||
|
CreateHumanitecConnectionSchema,
|
||||||
|
HumanitecOrgWithApps,
|
||||||
|
SanitizedHumanitecConnectionSchema,
|
||||||
|
UpdateHumanitecConnectionSchema
|
||||||
|
} from "@app/services/app-connection/humanitec";
|
||||||
|
import { AuthMode } from "@app/services/auth/auth-type";
|
||||||
|
|
||||||
|
import { registerAppConnectionEndpoints } from "./app-connection-endpoints";
|
||||||
|
|
||||||
|
export const registerHumanitecConnectionRouter = async (server: FastifyZodProvider) => {
|
||||||
|
registerAppConnectionEndpoints({
|
||||||
|
app: AppConnection.Humanitec,
|
||||||
|
server,
|
||||||
|
sanitizedResponseSchema: SanitizedHumanitecConnectionSchema,
|
||||||
|
createSchema: CreateHumanitecConnectionSchema,
|
||||||
|
updateSchema: UpdateHumanitecConnectionSchema
|
||||||
|
});
|
||||||
|
|
||||||
|
// The below endpoints are not exposed and for Infisical App use
|
||||||
|
server.route({
|
||||||
|
method: "GET",
|
||||||
|
url: `/:connectionId/organizations`,
|
||||||
|
config: {
|
||||||
|
rateLimit: readLimit
|
||||||
|
},
|
||||||
|
schema: {
|
||||||
|
params: z.object({
|
||||||
|
connectionId: z.string().uuid()
|
||||||
|
}),
|
||||||
|
response: {
|
||||||
|
200: z
|
||||||
|
.object({
|
||||||
|
id: z.string(),
|
||||||
|
name: z.string(),
|
||||||
|
apps: z
|
||||||
|
.object({
|
||||||
|
id: z.string(),
|
||||||
|
name: z.string(),
|
||||||
|
envs: z
|
||||||
|
.object({
|
||||||
|
id: z.string(),
|
||||||
|
name: z.string()
|
||||||
|
})
|
||||||
|
.array()
|
||||||
|
})
|
||||||
|
.array()
|
||||||
|
})
|
||||||
|
.array()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onRequest: verifyAuth([AuthMode.JWT]),
|
||||||
|
handler: async (req) => {
|
||||||
|
const { connectionId } = req.params;
|
||||||
|
|
||||||
|
const organizations: HumanitecOrgWithApps[] = await server.services.appConnection.humanitec.listOrganizations(
|
||||||
|
connectionId,
|
||||||
|
req.permission
|
||||||
|
);
|
||||||
|
|
||||||
|
return organizations;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -6,6 +6,7 @@ import { registerAzureKeyVaultConnectionRouter } from "./azure-key-vault-connect
|
|||||||
import { registerDatabricksConnectionRouter } from "./databricks-connection-router";
|
import { registerDatabricksConnectionRouter } from "./databricks-connection-router";
|
||||||
import { registerGcpConnectionRouter } from "./gcp-connection-router";
|
import { registerGcpConnectionRouter } from "./gcp-connection-router";
|
||||||
import { registerGitHubConnectionRouter } from "./github-connection-router";
|
import { registerGitHubConnectionRouter } from "./github-connection-router";
|
||||||
|
import { registerHumanitecConnectionRouter } from "./humanitec-connection-router";
|
||||||
|
|
||||||
export * from "./app-connection-router";
|
export * from "./app-connection-router";
|
||||||
|
|
||||||
@@ -16,5 +17,6 @@ export const APP_CONNECTION_REGISTER_ROUTER_MAP: Record<AppConnection, (server:
|
|||||||
[AppConnection.GCP]: registerGcpConnectionRouter,
|
[AppConnection.GCP]: registerGcpConnectionRouter,
|
||||||
[AppConnection.AzureKeyVault]: registerAzureKeyVaultConnectionRouter,
|
[AppConnection.AzureKeyVault]: registerAzureKeyVaultConnectionRouter,
|
||||||
[AppConnection.AzureAppConfiguration]: registerAzureAppConfigurationConnectionRouter,
|
[AppConnection.AzureAppConfiguration]: registerAzureAppConfigurationConnectionRouter,
|
||||||
[AppConnection.Databricks]: registerDatabricksConnectionRouter
|
[AppConnection.Databricks]: registerDatabricksConnectionRouter,
|
||||||
|
[AppConnection.Humanitec]: registerHumanitecConnectionRouter
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import {
|
||||||
|
CreateHumanitecSyncSchema,
|
||||||
|
HumanitecSyncSchema,
|
||||||
|
UpdateHumanitecSyncSchema
|
||||||
|
} from "@app/services/secret-sync/humanitec";
|
||||||
|
import { SecretSync } from "@app/services/secret-sync/secret-sync-enums";
|
||||||
|
|
||||||
|
import { registerSyncSecretsEndpoints } from "./secret-sync-endpoints";
|
||||||
|
|
||||||
|
export const registerHumanitecSyncRouter = async (server: FastifyZodProvider) =>
|
||||||
|
registerSyncSecretsEndpoints({
|
||||||
|
destination: SecretSync.Humanitec,
|
||||||
|
server,
|
||||||
|
responseSchema: HumanitecSyncSchema,
|
||||||
|
createSchema: CreateHumanitecSyncSchema,
|
||||||
|
updateSchema: UpdateHumanitecSyncSchema
|
||||||
|
});
|
||||||
@@ -7,6 +7,7 @@ import { registerAzureKeyVaultSyncRouter } from "./azure-key-vault-sync-router";
|
|||||||
import { registerDatabricksSyncRouter } from "./databricks-sync-router";
|
import { registerDatabricksSyncRouter } from "./databricks-sync-router";
|
||||||
import { registerGcpSyncRouter } from "./gcp-sync-router";
|
import { registerGcpSyncRouter } from "./gcp-sync-router";
|
||||||
import { registerGitHubSyncRouter } from "./github-sync-router";
|
import { registerGitHubSyncRouter } from "./github-sync-router";
|
||||||
|
import { registerHumanitecSyncRouter } from "./humanitec-sync-router";
|
||||||
|
|
||||||
export * from "./secret-sync-router";
|
export * from "./secret-sync-router";
|
||||||
|
|
||||||
@@ -17,5 +18,6 @@ export const SECRET_SYNC_REGISTER_ROUTER_MAP: Record<SecretSync, (server: Fastif
|
|||||||
[SecretSync.GCPSecretManager]: registerGcpSyncRouter,
|
[SecretSync.GCPSecretManager]: registerGcpSyncRouter,
|
||||||
[SecretSync.AzureKeyVault]: registerAzureKeyVaultSyncRouter,
|
[SecretSync.AzureKeyVault]: registerAzureKeyVaultSyncRouter,
|
||||||
[SecretSync.AzureAppConfiguration]: registerAzureAppConfigurationSyncRouter,
|
[SecretSync.AzureAppConfiguration]: registerAzureAppConfigurationSyncRouter,
|
||||||
[SecretSync.Databricks]: registerDatabricksSyncRouter
|
[SecretSync.Databricks]: registerDatabricksSyncRouter,
|
||||||
|
[SecretSync.Humanitec]: registerHumanitecSyncRouter
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import { AzureKeyVaultSyncListItemSchema, AzureKeyVaultSyncSchema } from "@app/s
|
|||||||
import { DatabricksSyncListItemSchema, DatabricksSyncSchema } from "@app/services/secret-sync/databricks";
|
import { DatabricksSyncListItemSchema, DatabricksSyncSchema } from "@app/services/secret-sync/databricks";
|
||||||
import { GcpSyncListItemSchema, GcpSyncSchema } from "@app/services/secret-sync/gcp";
|
import { GcpSyncListItemSchema, GcpSyncSchema } from "@app/services/secret-sync/gcp";
|
||||||
import { GitHubSyncListItemSchema, GitHubSyncSchema } from "@app/services/secret-sync/github";
|
import { GitHubSyncListItemSchema, GitHubSyncSchema } from "@app/services/secret-sync/github";
|
||||||
|
import { HumanitecSyncListItemSchema, HumanitecSyncSchema } from "@app/services/secret-sync/humanitec";
|
||||||
|
|
||||||
const SecretSyncSchema = z.discriminatedUnion("destination", [
|
const SecretSyncSchema = z.discriminatedUnion("destination", [
|
||||||
AwsParameterStoreSyncSchema,
|
AwsParameterStoreSyncSchema,
|
||||||
@@ -29,7 +30,8 @@ const SecretSyncSchema = z.discriminatedUnion("destination", [
|
|||||||
GcpSyncSchema,
|
GcpSyncSchema,
|
||||||
AzureKeyVaultSyncSchema,
|
AzureKeyVaultSyncSchema,
|
||||||
AzureAppConfigurationSyncSchema,
|
AzureAppConfigurationSyncSchema,
|
||||||
DatabricksSyncSchema
|
DatabricksSyncSchema,
|
||||||
|
HumanitecSyncSchema
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const SecretSyncOptionsSchema = z.discriminatedUnion("destination", [
|
const SecretSyncOptionsSchema = z.discriminatedUnion("destination", [
|
||||||
@@ -39,7 +41,8 @@ const SecretSyncOptionsSchema = z.discriminatedUnion("destination", [
|
|||||||
GcpSyncListItemSchema,
|
GcpSyncListItemSchema,
|
||||||
AzureKeyVaultSyncListItemSchema,
|
AzureKeyVaultSyncListItemSchema,
|
||||||
AzureAppConfigurationSyncListItemSchema,
|
AzureAppConfigurationSyncListItemSchema,
|
||||||
DatabricksSyncListItemSchema
|
DatabricksSyncListItemSchema,
|
||||||
|
HumanitecSyncListItemSchema
|
||||||
]);
|
]);
|
||||||
|
|
||||||
export const registerSecretSyncRouter = async (server: FastifyZodProvider) => {
|
export const registerSecretSyncRouter = async (server: FastifyZodProvider) => {
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ export enum AppConnection {
|
|||||||
Databricks = "databricks",
|
Databricks = "databricks",
|
||||||
GCP = "gcp",
|
GCP = "gcp",
|
||||||
AzureKeyVault = "azure-key-vault",
|
AzureKeyVault = "azure-key-vault",
|
||||||
AzureAppConfiguration = "azure-app-configuration"
|
AzureAppConfiguration = "azure-app-configuration",
|
||||||
|
Humanitec = "humanitec"
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum AWSRegion {
|
export enum AWSRegion {
|
||||||
|
|||||||
@@ -35,6 +35,11 @@ import {
|
|||||||
getAzureKeyVaultConnectionListItem,
|
getAzureKeyVaultConnectionListItem,
|
||||||
validateAzureKeyVaultConnectionCredentials
|
validateAzureKeyVaultConnectionCredentials
|
||||||
} from "./azure-key-vault";
|
} from "./azure-key-vault";
|
||||||
|
import {
|
||||||
|
getHumanitecConnectionListItem,
|
||||||
|
HumanitecConnectionMethod,
|
||||||
|
validateHumanitecConnectionCredentials
|
||||||
|
} from "./humanitec";
|
||||||
|
|
||||||
export const listAppConnectionOptions = () => {
|
export const listAppConnectionOptions = () => {
|
||||||
return [
|
return [
|
||||||
@@ -43,7 +48,8 @@ export const listAppConnectionOptions = () => {
|
|||||||
getGcpConnectionListItem(),
|
getGcpConnectionListItem(),
|
||||||
getAzureKeyVaultConnectionListItem(),
|
getAzureKeyVaultConnectionListItem(),
|
||||||
getAzureAppConfigurationConnectionListItem(),
|
getAzureAppConfigurationConnectionListItem(),
|
||||||
getDatabricksConnectionListItem()
|
getDatabricksConnectionListItem(),
|
||||||
|
getHumanitecConnectionListItem()
|
||||||
].sort((a, b) => a.name.localeCompare(b.name));
|
].sort((a, b) => a.name.localeCompare(b.name));
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -106,6 +112,8 @@ export const validateAppConnectionCredentials = async (
|
|||||||
return validateAzureKeyVaultConnectionCredentials(appConnection);
|
return validateAzureKeyVaultConnectionCredentials(appConnection);
|
||||||
case AppConnection.AzureAppConfiguration:
|
case AppConnection.AzureAppConfiguration:
|
||||||
return validateAzureAppConfigurationConnectionCredentials(appConnection);
|
return validateAzureAppConfigurationConnectionCredentials(appConnection);
|
||||||
|
case AppConnection.Humanitec:
|
||||||
|
return validateHumanitecConnectionCredentials(appConnection);
|
||||||
default:
|
default:
|
||||||
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
||||||
throw new Error(`Unhandled App Connection ${app}`);
|
throw new Error(`Unhandled App Connection ${app}`);
|
||||||
@@ -128,6 +136,8 @@ export const getAppConnectionMethodName = (method: TAppConnection["method"]) =>
|
|||||||
return "Service Account Impersonation";
|
return "Service Account Impersonation";
|
||||||
case DatabricksConnectionMethod.ServicePrincipal:
|
case DatabricksConnectionMethod.ServicePrincipal:
|
||||||
return "Service Principal";
|
return "Service Principal";
|
||||||
|
case HumanitecConnectionMethod.AccessKey:
|
||||||
|
return "Access Key";
|
||||||
default:
|
default:
|
||||||
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
||||||
throw new Error(`Unhandled App Connection Method: ${method}`);
|
throw new Error(`Unhandled App Connection Method: ${method}`);
|
||||||
|
|||||||
@@ -6,5 +6,6 @@ export const APP_CONNECTION_NAME_MAP: Record<AppConnection, string> = {
|
|||||||
[AppConnection.GCP]: "GCP",
|
[AppConnection.GCP]: "GCP",
|
||||||
[AppConnection.AzureKeyVault]: "Azure Key Vault",
|
[AppConnection.AzureKeyVault]: "Azure Key Vault",
|
||||||
[AppConnection.AzureAppConfiguration]: "Azure App Configuration",
|
[AppConnection.AzureAppConfiguration]: "Azure App Configuration",
|
||||||
[AppConnection.Databricks]: "Databricks"
|
[AppConnection.Databricks]: "Databricks",
|
||||||
|
[AppConnection.Humanitec]: "Humanitec"
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -35,6 +35,8 @@ import { ValidateGcpConnectionCredentialsSchema } from "./gcp";
|
|||||||
import { gcpConnectionService } from "./gcp/gcp-connection-service";
|
import { gcpConnectionService } from "./gcp/gcp-connection-service";
|
||||||
import { ValidateGitHubConnectionCredentialsSchema } from "./github";
|
import { ValidateGitHubConnectionCredentialsSchema } from "./github";
|
||||||
import { githubConnectionService } from "./github/github-connection-service";
|
import { githubConnectionService } from "./github/github-connection-service";
|
||||||
|
import { ValidateHumanitecConnectionCredentialsSchema } from "./humanitec";
|
||||||
|
import { humanitecConnectionService } from "./humanitec/humanitec-connection-service";
|
||||||
|
|
||||||
export type TAppConnectionServiceFactoryDep = {
|
export type TAppConnectionServiceFactoryDep = {
|
||||||
appConnectionDAL: TAppConnectionDALFactory;
|
appConnectionDAL: TAppConnectionDALFactory;
|
||||||
@@ -50,7 +52,8 @@ const VALIDATE_APP_CONNECTION_CREDENTIALS_MAP: Record<AppConnection, TValidateAp
|
|||||||
[AppConnection.GCP]: ValidateGcpConnectionCredentialsSchema,
|
[AppConnection.GCP]: ValidateGcpConnectionCredentialsSchema,
|
||||||
[AppConnection.AzureKeyVault]: ValidateAzureKeyVaultConnectionCredentialsSchema,
|
[AppConnection.AzureKeyVault]: ValidateAzureKeyVaultConnectionCredentialsSchema,
|
||||||
[AppConnection.AzureAppConfiguration]: ValidateAzureAppConfigurationConnectionCredentialsSchema,
|
[AppConnection.AzureAppConfiguration]: ValidateAzureAppConfigurationConnectionCredentialsSchema,
|
||||||
[AppConnection.Databricks]: ValidateDatabricksConnectionCredentialsSchema
|
[AppConnection.Databricks]: ValidateDatabricksConnectionCredentialsSchema,
|
||||||
|
[AppConnection.Humanitec]: ValidateHumanitecConnectionCredentialsSchema
|
||||||
};
|
};
|
||||||
|
|
||||||
export const appConnectionServiceFactory = ({
|
export const appConnectionServiceFactory = ({
|
||||||
@@ -371,6 +374,7 @@ export const appConnectionServiceFactory = ({
|
|||||||
github: githubConnectionService(connectAppConnectionById),
|
github: githubConnectionService(connectAppConnectionById),
|
||||||
gcp: gcpConnectionService(connectAppConnectionById),
|
gcp: gcpConnectionService(connectAppConnectionById),
|
||||||
databricks: databricksConnectionService(connectAppConnectionById, appConnectionDAL, kmsService),
|
databricks: databricksConnectionService(connectAppConnectionById, appConnectionDAL, kmsService),
|
||||||
aws: awsConnectionService(connectAppConnectionById)
|
aws: awsConnectionService(connectAppConnectionById),
|
||||||
|
humanitec: humanitecConnectionService(connectAppConnectionById)
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -32,6 +32,12 @@ import {
|
|||||||
TValidateAzureKeyVaultConnectionCredentials
|
TValidateAzureKeyVaultConnectionCredentials
|
||||||
} from "./azure-key-vault";
|
} from "./azure-key-vault";
|
||||||
import { TGcpConnection, TGcpConnectionConfig, TGcpConnectionInput, TValidateGcpConnectionCredentials } from "./gcp";
|
import { TGcpConnection, TGcpConnectionConfig, TGcpConnectionInput, TValidateGcpConnectionCredentials } from "./gcp";
|
||||||
|
import {
|
||||||
|
THumanitecConnection,
|
||||||
|
THumanitecConnectionConfig,
|
||||||
|
THumanitecConnectionInput,
|
||||||
|
TValidateHumanitecConnectionCredentials
|
||||||
|
} from "./humanitec";
|
||||||
|
|
||||||
export type TAppConnection = { id: string } & (
|
export type TAppConnection = { id: string } & (
|
||||||
| TAwsConnection
|
| TAwsConnection
|
||||||
@@ -40,6 +46,7 @@ export type TAppConnection = { id: string } & (
|
|||||||
| TAzureKeyVaultConnection
|
| TAzureKeyVaultConnection
|
||||||
| TAzureAppConfigurationConnection
|
| TAzureAppConfigurationConnection
|
||||||
| TDatabricksConnection
|
| TDatabricksConnection
|
||||||
|
| THumanitecConnection
|
||||||
);
|
);
|
||||||
|
|
||||||
export type TAppConnectionInput = { id: string } & (
|
export type TAppConnectionInput = { id: string } & (
|
||||||
@@ -49,6 +56,7 @@ export type TAppConnectionInput = { id: string } & (
|
|||||||
| TAzureKeyVaultConnectionInput
|
| TAzureKeyVaultConnectionInput
|
||||||
| TAzureAppConfigurationConnectionInput
|
| TAzureAppConfigurationConnectionInput
|
||||||
| TDatabricksConnectionInput
|
| TDatabricksConnectionInput
|
||||||
|
| THumanitecConnectionInput
|
||||||
);
|
);
|
||||||
|
|
||||||
export type TCreateAppConnectionDTO = Pick<
|
export type TCreateAppConnectionDTO = Pick<
|
||||||
@@ -66,7 +74,8 @@ export type TAppConnectionConfig =
|
|||||||
| TGcpConnectionConfig
|
| TGcpConnectionConfig
|
||||||
| TAzureKeyVaultConnectionConfig
|
| TAzureKeyVaultConnectionConfig
|
||||||
| TAzureAppConfigurationConnectionConfig
|
| TAzureAppConfigurationConnectionConfig
|
||||||
| TDatabricksConnectionConfig;
|
| TDatabricksConnectionConfig
|
||||||
|
| THumanitecConnectionConfig;
|
||||||
|
|
||||||
export type TValidateAppConnectionCredentials =
|
export type TValidateAppConnectionCredentials =
|
||||||
| TValidateAwsConnectionCredentials
|
| TValidateAwsConnectionCredentials
|
||||||
@@ -74,7 +83,8 @@ export type TValidateAppConnectionCredentials =
|
|||||||
| TValidateGcpConnectionCredentials
|
| TValidateGcpConnectionCredentials
|
||||||
| TValidateAzureKeyVaultConnectionCredentials
|
| TValidateAzureKeyVaultConnectionCredentials
|
||||||
| TValidateAzureAppConfigurationConnectionCredentials
|
| TValidateAzureAppConfigurationConnectionCredentials
|
||||||
| TValidateDatabricksConnectionCredentials;
|
| TValidateDatabricksConnectionCredentials
|
||||||
|
| TValidateHumanitecConnectionCredentials;
|
||||||
|
|
||||||
export type TListAwsConnectionKmsKeys = {
|
export type TListAwsConnectionKmsKeys = {
|
||||||
connectionId: string;
|
connectionId: string;
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
export enum HumanitecConnectionMethod {
|
||||||
|
AccessKey = "access-key"
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
import { AxiosError, AxiosResponse } from "axios";
|
||||||
|
|
||||||
|
import { request } from "@app/lib/config/request";
|
||||||
|
import { BadRequestError, InternalServerError } from "@app/lib/errors";
|
||||||
|
import { AppConnection } from "@app/services/app-connection/app-connection-enums";
|
||||||
|
import { IntegrationUrls } from "@app/services/integration-auth/integration-list";
|
||||||
|
|
||||||
|
import { HumanitecConnectionMethod } from "./humanitec-connection-enums";
|
||||||
|
import {
|
||||||
|
HumanitecApp,
|
||||||
|
HumanitecOrg,
|
||||||
|
HumanitecOrgWithApps,
|
||||||
|
THumanitecConnection,
|
||||||
|
THumanitecConnectionConfig
|
||||||
|
} from "./humanitec-connection-types";
|
||||||
|
|
||||||
|
export const getHumanitecConnectionListItem = () => {
|
||||||
|
return {
|
||||||
|
name: "Humanitec" as const,
|
||||||
|
app: AppConnection.Humanitec as const,
|
||||||
|
methods: Object.values(HumanitecConnectionMethod) as [HumanitecConnectionMethod.AccessKey]
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const validateHumanitecConnectionCredentials = async (config: THumanitecConnectionConfig) => {
|
||||||
|
const { credentials: inputCredentials } = config;
|
||||||
|
|
||||||
|
let response: AxiosResponse<HumanitecOrg[]> | null = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
response = await request.get<HumanitecOrg[]>(`${IntegrationUrls.HUMANITEC_API_URL}/orgs`, {
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${inputCredentials.accessKeyId}`
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (error: unknown) {
|
||||||
|
if (error instanceof AxiosError) {
|
||||||
|
throw new BadRequestError({
|
||||||
|
message: `Failed to validate credentials: ${error.response?.data || "Unknown error"}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
throw new BadRequestError({
|
||||||
|
message: "Unable to validate connection - verify credentials"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response?.data) {
|
||||||
|
throw new InternalServerError({
|
||||||
|
message: "Failed to get organizations: Response was empty"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return inputCredentials;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const listOrganizations = async (appConnection: THumanitecConnection): Promise<HumanitecOrgWithApps[]> => {
|
||||||
|
const {
|
||||||
|
credentials: { accessKeyId }
|
||||||
|
} = appConnection;
|
||||||
|
const response = await request.get<HumanitecOrg[]>(`${IntegrationUrls.HUMANITEC_API_URL}/orgs`, {
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${accessKeyId}`
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.data) {
|
||||||
|
throw new InternalServerError({
|
||||||
|
message: "Failed to get organizations: Response was empty"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const orgs = response.data;
|
||||||
|
const appPromises = orgs.map(async (org) => {
|
||||||
|
return request.get<HumanitecApp[]>(`${IntegrationUrls.HUMANITEC_API_URL}/orgs/${org.id}/apps`, {
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${accessKeyId}`
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const appsResponses = await Promise.all(appPromises);
|
||||||
|
|
||||||
|
const orgsWithApps: HumanitecOrgWithApps[] = orgs.map((org, index) => {
|
||||||
|
if (!appsResponses[index].data) {
|
||||||
|
throw new InternalServerError({
|
||||||
|
message: "Failed to get apps for organization: Response was empty"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const apps = appsResponses[index].data;
|
||||||
|
return {
|
||||||
|
...org,
|
||||||
|
apps: apps.map((app) => ({
|
||||||
|
name: app.name,
|
||||||
|
id: app.id,
|
||||||
|
envs: app.envs
|
||||||
|
}))
|
||||||
|
};
|
||||||
|
});
|
||||||
|
return orgsWithApps;
|
||||||
|
};
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
import z from "zod";
|
||||||
|
|
||||||
|
import { AppConnections } from "@app/lib/api-docs";
|
||||||
|
import { AppConnection } from "@app/services/app-connection/app-connection-enums";
|
||||||
|
import {
|
||||||
|
BaseAppConnectionSchema,
|
||||||
|
GenericCreateAppConnectionFieldsSchema,
|
||||||
|
GenericUpdateAppConnectionFieldsSchema
|
||||||
|
} from "@app/services/app-connection/app-connection-schemas";
|
||||||
|
|
||||||
|
import { HumanitecConnectionMethod } from "./humanitec-connection-enums";
|
||||||
|
|
||||||
|
export const HumanitecConnectionAccessTokenCredentialsSchema = z.object({
|
||||||
|
accessKeyId: z.string().trim().min(1, "Access Key ID required")
|
||||||
|
});
|
||||||
|
|
||||||
|
const BaseHumanitecConnectionSchema = BaseAppConnectionSchema.extend({ app: z.literal(AppConnection.Humanitec) });
|
||||||
|
|
||||||
|
export const HumanitecConnectionSchema = BaseHumanitecConnectionSchema.extend({
|
||||||
|
method: z.literal(HumanitecConnectionMethod.AccessKey),
|
||||||
|
credentials: HumanitecConnectionAccessTokenCredentialsSchema
|
||||||
|
});
|
||||||
|
|
||||||
|
export const SanitizedHumanitecConnectionSchema = z.discriminatedUnion("method", [
|
||||||
|
BaseHumanitecConnectionSchema.extend({
|
||||||
|
method: z.literal(HumanitecConnectionMethod.AccessKey),
|
||||||
|
credentials: HumanitecConnectionAccessTokenCredentialsSchema.pick({})
|
||||||
|
})
|
||||||
|
]);
|
||||||
|
|
||||||
|
export const ValidateHumanitecConnectionCredentialsSchema = z.discriminatedUnion("method", [
|
||||||
|
z.object({
|
||||||
|
method: z
|
||||||
|
.literal(HumanitecConnectionMethod.AccessKey)
|
||||||
|
.describe(AppConnections?.CREATE(AppConnection.Humanitec).method),
|
||||||
|
credentials: HumanitecConnectionAccessTokenCredentialsSchema.describe(
|
||||||
|
AppConnections.CREATE(AppConnection.Humanitec).credentials
|
||||||
|
)
|
||||||
|
})
|
||||||
|
]);
|
||||||
|
|
||||||
|
export const CreateHumanitecConnectionSchema = ValidateHumanitecConnectionCredentialsSchema.and(
|
||||||
|
GenericCreateAppConnectionFieldsSchema(AppConnection.Humanitec)
|
||||||
|
);
|
||||||
|
|
||||||
|
export const UpdateHumanitecConnectionSchema = z
|
||||||
|
.object({
|
||||||
|
credentials: HumanitecConnectionAccessTokenCredentialsSchema.optional().describe(
|
||||||
|
AppConnections.UPDATE(AppConnection.Humanitec).credentials
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.and(GenericUpdateAppConnectionFieldsSchema(AppConnection.Humanitec));
|
||||||
|
|
||||||
|
export const HumanitecConnectionListItemSchema = z.object({
|
||||||
|
name: z.literal("Humanitec"),
|
||||||
|
app: z.literal(AppConnection.Humanitec),
|
||||||
|
methods: z.nativeEnum(HumanitecConnectionMethod).array()
|
||||||
|
});
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import { OrgServiceActor } from "@app/lib/types";
|
||||||
|
|
||||||
|
import { AppConnection } from "../app-connection-enums";
|
||||||
|
import { listOrganizations as getHumanitecOrganizations } from "./humanitec-connection-fns";
|
||||||
|
import { THumanitecConnection } from "./humanitec-connection-types";
|
||||||
|
|
||||||
|
type TGetAppConnectionFunc = (
|
||||||
|
app: AppConnection,
|
||||||
|
connectionId: string,
|
||||||
|
actor: OrgServiceActor
|
||||||
|
) => Promise<THumanitecConnection>;
|
||||||
|
|
||||||
|
export const humanitecConnectionService = (getAppConnection: TGetAppConnectionFunc) => {
|
||||||
|
const listOrganizations = async (connectionId: string, actor: OrgServiceActor) => {
|
||||||
|
const appConnection = await getAppConnection(AppConnection.Humanitec, connectionId, actor);
|
||||||
|
try {
|
||||||
|
const organizations = await getHumanitecOrganizations(appConnection);
|
||||||
|
return organizations;
|
||||||
|
} catch (error) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
listOrganizations
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import z from "zod";
|
||||||
|
|
||||||
|
import { DiscriminativePick } from "@app/lib/types";
|
||||||
|
|
||||||
|
import { AppConnection } from "../app-connection-enums";
|
||||||
|
import {
|
||||||
|
CreateHumanitecConnectionSchema,
|
||||||
|
HumanitecConnectionSchema,
|
||||||
|
ValidateHumanitecConnectionCredentialsSchema
|
||||||
|
} from "./humanitec-connection-schemas";
|
||||||
|
|
||||||
|
export type THumanitecConnection = z.infer<typeof HumanitecConnectionSchema>;
|
||||||
|
|
||||||
|
export type THumanitecConnectionInput = z.infer<typeof CreateHumanitecConnectionSchema> & {
|
||||||
|
app: AppConnection.Humanitec;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type TValidateHumanitecConnectionCredentials = typeof ValidateHumanitecConnectionCredentialsSchema;
|
||||||
|
|
||||||
|
export type THumanitecConnectionConfig = DiscriminativePick<
|
||||||
|
THumanitecConnectionInput,
|
||||||
|
"method" | "app" | "credentials"
|
||||||
|
> & {
|
||||||
|
orgId: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type HumanitecOrg = {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type HumanitecApp = {
|
||||||
|
name: string;
|
||||||
|
id: string;
|
||||||
|
envs: { name: string; id: string }[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export type HumanitecOrgWithApps = HumanitecOrg & {
|
||||||
|
apps: HumanitecApp[];
|
||||||
|
};
|
||||||
4
backend/src/services/app-connection/humanitec/index.ts
Normal file
4
backend/src/services/app-connection/humanitec/index.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
export * from "./humanitec-connection-enums";
|
||||||
|
export * from "./humanitec-connection-fns";
|
||||||
|
export * from "./humanitec-connection-schemas";
|
||||||
|
export * from "./humanitec-connection-types";
|
||||||
@@ -93,6 +93,7 @@ export enum IntegrationUrls {
|
|||||||
NORTHFLANK_API_URL = "https://api.northflank.com",
|
NORTHFLANK_API_URL = "https://api.northflank.com",
|
||||||
HASURA_CLOUD_API_URL = "https://data.pro.hasura.io/v1/graphql",
|
HASURA_CLOUD_API_URL = "https://data.pro.hasura.io/v1/graphql",
|
||||||
AZURE_DEVOPS_API_URL = "https://dev.azure.com",
|
AZURE_DEVOPS_API_URL = "https://dev.azure.com",
|
||||||
|
HUMANITEC_API_URL = "https://api.humanitec.io",
|
||||||
|
|
||||||
GCP_SECRET_MANAGER_SERVICE_NAME = "secretmanager.googleapis.com",
|
GCP_SECRET_MANAGER_SERVICE_NAME = "secretmanager.googleapis.com",
|
||||||
GCP_SECRET_MANAGER_URL = `https://${GCP_SECRET_MANAGER_SERVICE_NAME}`,
|
GCP_SECRET_MANAGER_URL = `https://${GCP_SECRET_MANAGER_SERVICE_NAME}`,
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { AppConnection } from "@app/services/app-connection/app-connection-enums";
|
||||||
|
import { SecretSync } from "@app/services/secret-sync/secret-sync-enums";
|
||||||
|
import { TSecretSyncListItem } from "@app/services/secret-sync/secret-sync-types";
|
||||||
|
|
||||||
|
export const HUMANITEC_SYNC_LIST_OPTION: TSecretSyncListItem = {
|
||||||
|
name: "Humanitec",
|
||||||
|
destination: SecretSync.Humanitec,
|
||||||
|
connection: AppConnection.Humanitec,
|
||||||
|
canImportSecrets: false
|
||||||
|
};
|
||||||
160
backend/src/services/secret-sync/humanitec/humanitec-sync-fns.ts
Normal file
160
backend/src/services/secret-sync/humanitec/humanitec-sync-fns.ts
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
import { request } from "@app/lib/config/request";
|
||||||
|
import { IntegrationUrls } from "@app/services/integration-auth/integration-list";
|
||||||
|
import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";
|
||||||
|
import { SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";
|
||||||
|
import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";
|
||||||
|
|
||||||
|
import { HumanitecSecret, THumanitecSyncWithCredentials } from "./humanitec-sync-types";
|
||||||
|
|
||||||
|
const getHumanitecSecrets = async (secretSync: THumanitecSyncWithCredentials) => {
|
||||||
|
const {
|
||||||
|
destinationConfig,
|
||||||
|
connection: {
|
||||||
|
credentials: { accessKeyId }
|
||||||
|
}
|
||||||
|
} = secretSync;
|
||||||
|
|
||||||
|
const { data } = await request.get<HumanitecSecret[]>(
|
||||||
|
`${IntegrationUrls.HUMANITEC_API_URL}/orgs/${destinationConfig.org}/apps/${destinationConfig.app}/envs/${destinationConfig.env}/values`,
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${accessKeyId}`,
|
||||||
|
"Accept-Encoding": "application/json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
};
|
||||||
|
|
||||||
|
const deleteSecret = async (secretSync: THumanitecSyncWithCredentials, encryptedSecret: HumanitecSecret) => {
|
||||||
|
const {
|
||||||
|
destinationConfig,
|
||||||
|
connection: {
|
||||||
|
credentials: { accessKeyId }
|
||||||
|
}
|
||||||
|
} = secretSync;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await request.delete(
|
||||||
|
`${IntegrationUrls.HUMANITEC_API_URL}/orgs/${destinationConfig.org}/apps/${destinationConfig.app}/envs/${destinationConfig.env}/values/${encryptedSecret.key}`,
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${accessKeyId}`,
|
||||||
|
"Accept-Encoding": "application/json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
throw new SecretSyncError({
|
||||||
|
error,
|
||||||
|
secretKey: encryptedSecret.key
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const createSecret = async (secretSync: THumanitecSyncWithCredentials, secretMap: TSecretMap, key: string) => {
|
||||||
|
try {
|
||||||
|
const {
|
||||||
|
destinationConfig,
|
||||||
|
connection: {
|
||||||
|
credentials: { accessKeyId }
|
||||||
|
}
|
||||||
|
} = secretSync;
|
||||||
|
|
||||||
|
await request.post(
|
||||||
|
`${IntegrationUrls.HUMANITEC_API_URL}/orgs/${destinationConfig.org}/apps/${destinationConfig.app}/values`,
|
||||||
|
{
|
||||||
|
key,
|
||||||
|
value: "",
|
||||||
|
description: secretMap[key].comment || ""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${accessKeyId}`,
|
||||||
|
"Accept-Encoding": "application/json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
await request.patch(
|
||||||
|
`${IntegrationUrls.HUMANITEC_API_URL}/orgs/${destinationConfig.org}/apps/${destinationConfig.app}/envs/${destinationConfig.env}/values/${key}`,
|
||||||
|
{
|
||||||
|
value: secretMap[key].value,
|
||||||
|
description: secretMap[key].comment || ""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${accessKeyId}`,
|
||||||
|
"Accept-Encoding": "application/json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
throw new SecretSyncError({
|
||||||
|
error,
|
||||||
|
secretKey: key
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateSecret = async (secretSync: THumanitecSyncWithCredentials, secretMap: TSecretMap, key: string) => {
|
||||||
|
try {
|
||||||
|
const {
|
||||||
|
destinationConfig,
|
||||||
|
connection: {
|
||||||
|
credentials: { accessKeyId }
|
||||||
|
}
|
||||||
|
} = secretSync;
|
||||||
|
await request.patch(
|
||||||
|
`${IntegrationUrls.HUMANITEC_API_URL}/orgs/${destinationConfig.org}/apps/${destinationConfig.app}/envs/${destinationConfig.env}/values/${key}`,
|
||||||
|
{
|
||||||
|
value: secretMap[key].value,
|
||||||
|
description: secretMap[key].comment
|
||||||
|
},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${accessKeyId}`,
|
||||||
|
"Accept-Encoding": "application/json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
throw new SecretSyncError({
|
||||||
|
error,
|
||||||
|
secretKey: key
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const HumanitecSyncFns = {
|
||||||
|
syncSecrets: async (secretSync: THumanitecSyncWithCredentials, secretMap: TSecretMap) => {
|
||||||
|
const humanitecSecrets = await getHumanitecSecrets(secretSync);
|
||||||
|
const humanitecSecretsKeys = new Set(humanitecSecrets.map((s) => s.key));
|
||||||
|
for await (const key of Object.keys(secretMap)) {
|
||||||
|
if (!humanitecSecretsKeys.has(key)) {
|
||||||
|
await createSecret(secretSync, secretMap, key);
|
||||||
|
} else {
|
||||||
|
await updateSecret(secretSync, secretMap, key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for await (const humanitecSecret of humanitecSecrets) {
|
||||||
|
if (!secretMap[humanitecSecret.key]) {
|
||||||
|
await deleteSecret(secretSync, humanitecSecret);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
getSecrets: async (secretSync: THumanitecSyncWithCredentials): Promise<TSecretMap> => {
|
||||||
|
throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);
|
||||||
|
},
|
||||||
|
|
||||||
|
removeSecrets: async (secretSync: THumanitecSyncWithCredentials, secretMap: TSecretMap) => {
|
||||||
|
const encryptedSecrets = await getHumanitecSecrets(secretSync);
|
||||||
|
|
||||||
|
for await (const encryptedSecret of encryptedSecrets) {
|
||||||
|
if (encryptedSecret.key in secretMap) {
|
||||||
|
await deleteSecret(secretSync, encryptedSecret);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import { SecretSyncs } from "@app/lib/api-docs";
|
||||||
|
import { AppConnection } from "@app/services/app-connection/app-connection-enums";
|
||||||
|
import { SecretSync } from "@app/services/secret-sync/secret-sync-enums";
|
||||||
|
import {
|
||||||
|
BaseSecretSyncSchema,
|
||||||
|
GenericCreateSecretSyncFieldsSchema,
|
||||||
|
GenericUpdateSecretSyncFieldsSchema
|
||||||
|
} from "@app/services/secret-sync/secret-sync-schemas";
|
||||||
|
import { TSyncOptionsConfig } from "@app/services/secret-sync/secret-sync-types";
|
||||||
|
|
||||||
|
const HumanitecSyncDestinationConfigSchema = z.object({
|
||||||
|
app: z.string().min(1, "App ID is required").describe(SecretSyncs.DESTINATION_CONFIG.HUMANITEC.app),
|
||||||
|
org: z.string().min(1, "Org ID is required").describe(SecretSyncs.DESTINATION_CONFIG.HUMANITEC.org),
|
||||||
|
env: z.string().min(1, "Env ID is required").describe(SecretSyncs.DESTINATION_CONFIG.HUMANITEC.env)
|
||||||
|
});
|
||||||
|
|
||||||
|
const HumanitecSyncOptionsConfig: TSyncOptionsConfig = { canImportSecrets: false };
|
||||||
|
|
||||||
|
export const HumanitecSyncSchema = BaseSecretSyncSchema(SecretSync.Humanitec, HumanitecSyncOptionsConfig).extend({
|
||||||
|
destination: z.literal(SecretSync.Humanitec),
|
||||||
|
destinationConfig: HumanitecSyncDestinationConfigSchema
|
||||||
|
});
|
||||||
|
|
||||||
|
export const CreateHumanitecSyncSchema = GenericCreateSecretSyncFieldsSchema(
|
||||||
|
SecretSync.Humanitec,
|
||||||
|
HumanitecSyncOptionsConfig
|
||||||
|
).extend({
|
||||||
|
destinationConfig: HumanitecSyncDestinationConfigSchema
|
||||||
|
});
|
||||||
|
|
||||||
|
export const UpdateHumanitecSyncSchema = GenericUpdateSecretSyncFieldsSchema(
|
||||||
|
SecretSync.Humanitec,
|
||||||
|
HumanitecSyncOptionsConfig
|
||||||
|
).extend({
|
||||||
|
destinationConfig: HumanitecSyncDestinationConfigSchema.optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
export const HumanitecSyncListItemSchema = z.object({
|
||||||
|
name: z.literal("Humanitec"),
|
||||||
|
connection: z.literal(AppConnection.Humanitec),
|
||||||
|
destination: z.literal(SecretSync.Humanitec),
|
||||||
|
canImportSecrets: z.literal(false)
|
||||||
|
});
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import z from "zod";
|
||||||
|
|
||||||
|
import { THumanitecConnection } from "@app/services/app-connection/humanitec";
|
||||||
|
|
||||||
|
import { CreateHumanitecSyncSchema, HumanitecSyncListItemSchema, HumanitecSyncSchema } from "./humanitec-sync-schemas";
|
||||||
|
|
||||||
|
export type THumanitecSyncListItem = z.infer<typeof HumanitecSyncListItemSchema>;
|
||||||
|
|
||||||
|
export type THumanitecSync = z.infer<typeof HumanitecSyncSchema>;
|
||||||
|
|
||||||
|
export type THumanitecSyncInput = z.infer<typeof CreateHumanitecSyncSchema>;
|
||||||
|
|
||||||
|
export type THumanitecSyncWithCredentials = THumanitecSync & {
|
||||||
|
connection: THumanitecConnection;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type HumanitecSecret = {
|
||||||
|
description: string;
|
||||||
|
is_secret: boolean;
|
||||||
|
key: string;
|
||||||
|
source: "app" | "env";
|
||||||
|
value: string;
|
||||||
|
};
|
||||||
4
backend/src/services/secret-sync/humanitec/index.ts
Normal file
4
backend/src/services/secret-sync/humanitec/index.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
export * from "./humanitec-sync-constants";
|
||||||
|
export * from "./humanitec-sync-fns";
|
||||||
|
export * from "./humanitec-sync-schemas";
|
||||||
|
export * from "./humanitec-sync-types";
|
||||||
@@ -5,7 +5,8 @@ export enum SecretSync {
|
|||||||
GCPSecretManager = "gcp-secret-manager",
|
GCPSecretManager = "gcp-secret-manager",
|
||||||
AzureKeyVault = "azure-key-vault",
|
AzureKeyVault = "azure-key-vault",
|
||||||
AzureAppConfiguration = "azure-app-configuration",
|
AzureAppConfiguration = "azure-app-configuration",
|
||||||
Databricks = "databricks"
|
Databricks = "databricks",
|
||||||
|
Humanitec = "humanitec"
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum SecretSyncInitialSyncBehavior {
|
export enum SecretSyncInitialSyncBehavior {
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ import { AZURE_APP_CONFIGURATION_SYNC_LIST_OPTION, azureAppConfigurationSyncFact
|
|||||||
import { AZURE_KEY_VAULT_SYNC_LIST_OPTION, azureKeyVaultSyncFactory } from "./azure-key-vault";
|
import { AZURE_KEY_VAULT_SYNC_LIST_OPTION, azureKeyVaultSyncFactory } from "./azure-key-vault";
|
||||||
import { GCP_SYNC_LIST_OPTION } from "./gcp";
|
import { GCP_SYNC_LIST_OPTION } from "./gcp";
|
||||||
import { GcpSyncFns } from "./gcp/gcp-sync-fns";
|
import { GcpSyncFns } from "./gcp/gcp-sync-fns";
|
||||||
|
import { HUMANITEC_SYNC_LIST_OPTION } from "./humanitec";
|
||||||
|
import { HumanitecSyncFns } from "./humanitec/humanitec-sync-fns";
|
||||||
|
|
||||||
const SECRET_SYNC_LIST_OPTIONS: Record<SecretSync, TSecretSyncListItem> = {
|
const SECRET_SYNC_LIST_OPTIONS: Record<SecretSync, TSecretSyncListItem> = {
|
||||||
[SecretSync.AWSParameterStore]: AWS_PARAMETER_STORE_SYNC_LIST_OPTION,
|
[SecretSync.AWSParameterStore]: AWS_PARAMETER_STORE_SYNC_LIST_OPTION,
|
||||||
@@ -32,7 +34,8 @@ const SECRET_SYNC_LIST_OPTIONS: Record<SecretSync, TSecretSyncListItem> = {
|
|||||||
[SecretSync.GCPSecretManager]: GCP_SYNC_LIST_OPTION,
|
[SecretSync.GCPSecretManager]: GCP_SYNC_LIST_OPTION,
|
||||||
[SecretSync.AzureKeyVault]: AZURE_KEY_VAULT_SYNC_LIST_OPTION,
|
[SecretSync.AzureKeyVault]: AZURE_KEY_VAULT_SYNC_LIST_OPTION,
|
||||||
[SecretSync.AzureAppConfiguration]: AZURE_APP_CONFIGURATION_SYNC_LIST_OPTION,
|
[SecretSync.AzureAppConfiguration]: AZURE_APP_CONFIGURATION_SYNC_LIST_OPTION,
|
||||||
[SecretSync.Databricks]: DATABRICKS_SYNC_LIST_OPTION
|
[SecretSync.Databricks]: DATABRICKS_SYNC_LIST_OPTION,
|
||||||
|
[SecretSync.Humanitec]: HUMANITEC_SYNC_LIST_OPTION
|
||||||
};
|
};
|
||||||
|
|
||||||
export const listSecretSyncOptions = () => {
|
export const listSecretSyncOptions = () => {
|
||||||
@@ -116,6 +119,8 @@ export const SecretSyncFns = {
|
|||||||
appConnectionDAL,
|
appConnectionDAL,
|
||||||
kmsService
|
kmsService
|
||||||
}).syncSecrets(secretSync, secretMap);
|
}).syncSecrets(secretSync, secretMap);
|
||||||
|
case SecretSync.Humanitec:
|
||||||
|
return HumanitecSyncFns.syncSecrets(secretSync, secretMap);
|
||||||
default:
|
default:
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Unhandled sync destination for sync secrets fns: ${(secretSync as TSecretSyncWithCredentials).destination}`
|
`Unhandled sync destination for sync secrets fns: ${(secretSync as TSecretSyncWithCredentials).destination}`
|
||||||
@@ -157,6 +162,9 @@ export const SecretSyncFns = {
|
|||||||
appConnectionDAL,
|
appConnectionDAL,
|
||||||
kmsService
|
kmsService
|
||||||
}).getSecrets(secretSync);
|
}).getSecrets(secretSync);
|
||||||
|
case SecretSync.Humanitec:
|
||||||
|
secretMap = await HumanitecSyncFns.getSecrets(secretSync);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Unhandled sync destination for get secrets fns: ${(secretSync as TSecretSyncWithCredentials).destination}`
|
`Unhandled sync destination for get secrets fns: ${(secretSync as TSecretSyncWithCredentials).destination}`
|
||||||
@@ -197,6 +205,8 @@ export const SecretSyncFns = {
|
|||||||
appConnectionDAL,
|
appConnectionDAL,
|
||||||
kmsService
|
kmsService
|
||||||
}).removeSecrets(secretSync, secretMap);
|
}).removeSecrets(secretSync, secretMap);
|
||||||
|
case SecretSync.Humanitec:
|
||||||
|
return HumanitecSyncFns.removeSecrets(secretSync, secretMap);
|
||||||
default:
|
default:
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Unhandled sync destination for remove secrets fns: ${(secretSync as TSecretSyncWithCredentials).destination}`
|
`Unhandled sync destination for remove secrets fns: ${(secretSync as TSecretSyncWithCredentials).destination}`
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ export const SECRET_SYNC_NAME_MAP: Record<SecretSync, string> = {
|
|||||||
[SecretSync.GCPSecretManager]: "GCP Secret Manager",
|
[SecretSync.GCPSecretManager]: "GCP Secret Manager",
|
||||||
[SecretSync.AzureKeyVault]: "Azure Key Vault",
|
[SecretSync.AzureKeyVault]: "Azure Key Vault",
|
||||||
[SecretSync.AzureAppConfiguration]: "Azure App Configuration",
|
[SecretSync.AzureAppConfiguration]: "Azure App Configuration",
|
||||||
[SecretSync.Databricks]: "Databricks"
|
[SecretSync.Databricks]: "Databricks",
|
||||||
|
[SecretSync.Humanitec]: "Humanitec"
|
||||||
};
|
};
|
||||||
|
|
||||||
export const SECRET_SYNC_CONNECTION_MAP: Record<SecretSync, AppConnection> = {
|
export const SECRET_SYNC_CONNECTION_MAP: Record<SecretSync, AppConnection> = {
|
||||||
@@ -18,5 +19,6 @@ export const SECRET_SYNC_CONNECTION_MAP: Record<SecretSync, AppConnection> = {
|
|||||||
[SecretSync.GCPSecretManager]: AppConnection.GCP,
|
[SecretSync.GCPSecretManager]: AppConnection.GCP,
|
||||||
[SecretSync.AzureKeyVault]: AppConnection.AzureKeyVault,
|
[SecretSync.AzureKeyVault]: AppConnection.AzureKeyVault,
|
||||||
[SecretSync.AzureAppConfiguration]: AppConnection.AzureAppConfiguration,
|
[SecretSync.AzureAppConfiguration]: AppConnection.AzureAppConfiguration,
|
||||||
[SecretSync.Databricks]: AppConnection.Databricks
|
[SecretSync.Databricks]: AppConnection.Databricks,
|
||||||
|
[SecretSync.Humanitec]: AppConnection.Humanitec
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -43,6 +43,12 @@ import {
|
|||||||
TAzureKeyVaultSyncWithCredentials
|
TAzureKeyVaultSyncWithCredentials
|
||||||
} from "./azure-key-vault";
|
} from "./azure-key-vault";
|
||||||
import { TGcpSync, TGcpSyncInput, TGcpSyncListItem, TGcpSyncWithCredentials } from "./gcp";
|
import { TGcpSync, TGcpSyncInput, TGcpSyncListItem, TGcpSyncWithCredentials } from "./gcp";
|
||||||
|
import {
|
||||||
|
THumanitecSync,
|
||||||
|
THumanitecSyncInput,
|
||||||
|
THumanitecSyncListItem,
|
||||||
|
THumanitecSyncWithCredentials
|
||||||
|
} from "./humanitec";
|
||||||
|
|
||||||
export type TSecretSync =
|
export type TSecretSync =
|
||||||
| TAwsParameterStoreSync
|
| TAwsParameterStoreSync
|
||||||
@@ -51,7 +57,8 @@ export type TSecretSync =
|
|||||||
| TGcpSync
|
| TGcpSync
|
||||||
| TAzureKeyVaultSync
|
| TAzureKeyVaultSync
|
||||||
| TAzureAppConfigurationSync
|
| TAzureAppConfigurationSync
|
||||||
| TDatabricksSync;
|
| TDatabricksSync
|
||||||
|
| THumanitecSync;
|
||||||
|
|
||||||
export type TSecretSyncWithCredentials =
|
export type TSecretSyncWithCredentials =
|
||||||
| TAwsParameterStoreSyncWithCredentials
|
| TAwsParameterStoreSyncWithCredentials
|
||||||
@@ -60,7 +67,8 @@ export type TSecretSyncWithCredentials =
|
|||||||
| TGcpSyncWithCredentials
|
| TGcpSyncWithCredentials
|
||||||
| TAzureKeyVaultSyncWithCredentials
|
| TAzureKeyVaultSyncWithCredentials
|
||||||
| TAzureAppConfigurationSyncWithCredentials
|
| TAzureAppConfigurationSyncWithCredentials
|
||||||
| TDatabricksSyncWithCredentials;
|
| TDatabricksSyncWithCredentials
|
||||||
|
| THumanitecSyncWithCredentials;
|
||||||
|
|
||||||
export type TSecretSyncInput =
|
export type TSecretSyncInput =
|
||||||
| TAwsParameterStoreSyncInput
|
| TAwsParameterStoreSyncInput
|
||||||
@@ -69,7 +77,8 @@ export type TSecretSyncInput =
|
|||||||
| TGcpSyncInput
|
| TGcpSyncInput
|
||||||
| TAzureKeyVaultSyncInput
|
| TAzureKeyVaultSyncInput
|
||||||
| TAzureAppConfigurationSyncInput
|
| TAzureAppConfigurationSyncInput
|
||||||
| TDatabricksSyncInput;
|
| TDatabricksSyncInput
|
||||||
|
| THumanitecSyncInput;
|
||||||
|
|
||||||
export type TSecretSyncListItem =
|
export type TSecretSyncListItem =
|
||||||
| TAwsParameterStoreSyncListItem
|
| TAwsParameterStoreSyncListItem
|
||||||
@@ -78,7 +87,8 @@ export type TSecretSyncListItem =
|
|||||||
| TGcpSyncListItem
|
| TGcpSyncListItem
|
||||||
| TAzureKeyVaultSyncListItem
|
| TAzureKeyVaultSyncListItem
|
||||||
| TAzureAppConfigurationSyncListItem
|
| TAzureAppConfigurationSyncListItem
|
||||||
| TDatabricksSyncListItem;
|
| TDatabricksSyncListItem
|
||||||
|
| THumanitecSyncListItem;
|
||||||
|
|
||||||
export type TSyncOptionsConfig = {
|
export type TSyncOptionsConfig = {
|
||||||
canImportSecrets: boolean;
|
canImportSecrets: boolean;
|
||||||
|
|||||||
BIN
frontend/public/images/integrations/Humanitec.png
Normal file
BIN
frontend/public/images/integrations/Humanitec.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
@@ -0,0 +1,125 @@
|
|||||||
|
import { Controller, useFormContext, useWatch } from "react-hook-form";
|
||||||
|
import { SingleValue } from "react-select";
|
||||||
|
|
||||||
|
import { SecretSyncConnectionField } from "@app/components/secret-syncs/forms/SecretSyncConnectionField";
|
||||||
|
import { FilterableSelect, FormControl } from "@app/components/v2";
|
||||||
|
import {
|
||||||
|
THumanitecConnectionApp,
|
||||||
|
useHumanitecConnectionListOrganizations
|
||||||
|
} from "@app/hooks/api/appConnections/humanitec";
|
||||||
|
import { SecretSync } from "@app/hooks/api/secretSyncs";
|
||||||
|
|
||||||
|
import { TSecretSyncForm } from "../schemas";
|
||||||
|
|
||||||
|
export const HumanitecSyncFields = () => {
|
||||||
|
const { control, watch, setValue } = useFormContext<
|
||||||
|
TSecretSyncForm & { destination: SecretSync.Humanitec }
|
||||||
|
>();
|
||||||
|
|
||||||
|
const connectionId = useWatch({ name: "connection.id", control });
|
||||||
|
const currentOrg = watch("destinationConfig.org");
|
||||||
|
const currentApp = watch("destinationConfig.app");
|
||||||
|
|
||||||
|
const { data: organizations = [], isPending: isOrganizationsPending } =
|
||||||
|
useHumanitecConnectionListOrganizations(connectionId, {
|
||||||
|
enabled: Boolean(connectionId)
|
||||||
|
});
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<SecretSyncConnectionField
|
||||||
|
onChange={() => {
|
||||||
|
setValue("destinationConfig.org", "");
|
||||||
|
setValue("destinationConfig.app", "");
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Controller
|
||||||
|
name="destinationConfig.org"
|
||||||
|
control={control}
|
||||||
|
render={({ field: { value, onChange }, fieldState: { error } }) => (
|
||||||
|
<FormControl
|
||||||
|
errorText={error?.message}
|
||||||
|
isError={Boolean(error?.message)}
|
||||||
|
label="Organization"
|
||||||
|
>
|
||||||
|
<FilterableSelect
|
||||||
|
isLoading={isOrganizationsPending && Boolean(connectionId)}
|
||||||
|
isDisabled={!connectionId}
|
||||||
|
value={organizations ? (organizations.find((org) => org.id === value) ?? []) : []}
|
||||||
|
onChange={(option) =>
|
||||||
|
onChange((option as SingleValue<THumanitecConnectionApp>)?.id ?? null)
|
||||||
|
}
|
||||||
|
options={organizations}
|
||||||
|
placeholder="Select an organization..."
|
||||||
|
getOptionLabel={(option) => option.name}
|
||||||
|
getOptionValue={(option) => option.id.toString()}
|
||||||
|
/>
|
||||||
|
</FormControl>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<Controller
|
||||||
|
name="destinationConfig.app"
|
||||||
|
control={control}
|
||||||
|
render={({ field: { value, onChange }, fieldState: { error } }) => (
|
||||||
|
<FormControl isError={Boolean(error)} errorText={error?.message} label="App">
|
||||||
|
<FilterableSelect
|
||||||
|
menuPlacement="top"
|
||||||
|
isLoading={isOrganizationsPending && Boolean(connectionId) && Boolean(currentOrg)}
|
||||||
|
isDisabled={!connectionId || !currentOrg}
|
||||||
|
value={
|
||||||
|
organizations
|
||||||
|
.find((org) => org.id === currentOrg)
|
||||||
|
?.apps?.find((app) => app.id === value) ?? null
|
||||||
|
}
|
||||||
|
onChange={(option) =>
|
||||||
|
onChange((option as SingleValue<THumanitecConnectionApp>)?.id ?? null)
|
||||||
|
}
|
||||||
|
options={
|
||||||
|
currentOrg ? (organizations.find((org) => org.id === currentOrg)?.apps ?? []) : []
|
||||||
|
}
|
||||||
|
placeholder="Select an app..."
|
||||||
|
getOptionLabel={(option) => option.name}
|
||||||
|
getOptionValue={(option) => option.id.toString()}
|
||||||
|
/>
|
||||||
|
</FormControl>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<Controller
|
||||||
|
name="destinationConfig.env"
|
||||||
|
control={control}
|
||||||
|
render={({ field: { value, onChange }, fieldState: { error } }) => (
|
||||||
|
<FormControl isError={Boolean(error)} errorText={error?.message} label="Environment">
|
||||||
|
<FilterableSelect
|
||||||
|
menuPlacement="top"
|
||||||
|
isLoading={
|
||||||
|
isOrganizationsPending &&
|
||||||
|
Boolean(connectionId) &&
|
||||||
|
Boolean(currentOrg) &&
|
||||||
|
Boolean(currentApp)
|
||||||
|
}
|
||||||
|
isDisabled={!connectionId || !currentApp}
|
||||||
|
value={
|
||||||
|
organizations
|
||||||
|
.find((org) => org.id === currentOrg)
|
||||||
|
?.apps?.find((app) => app.id === currentApp)
|
||||||
|
?.envs?.find((env) => env.id === value) ?? null
|
||||||
|
}
|
||||||
|
onChange={(option) =>
|
||||||
|
onChange((option as SingleValue<THumanitecConnectionApp>)?.id ?? null)
|
||||||
|
}
|
||||||
|
options={
|
||||||
|
currentApp
|
||||||
|
? ((organizations.find((org) => org.id === currentOrg)?.apps ?? [])?.find(
|
||||||
|
(app) => app.id === currentApp
|
||||||
|
)?.envs ?? [])
|
||||||
|
: []
|
||||||
|
}
|
||||||
|
placeholder="Select an env..."
|
||||||
|
getOptionLabel={(option) => option.name}
|
||||||
|
getOptionValue={(option) => option.id.toString()}
|
||||||
|
/>
|
||||||
|
</FormControl>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -10,6 +10,7 @@ import { AzureKeyVaultSyncFields } from "./AzureKeyVaultSyncFields";
|
|||||||
import { DatabricksSyncFields } from "./DatabricksSyncFields";
|
import { DatabricksSyncFields } from "./DatabricksSyncFields";
|
||||||
import { GcpSyncFields } from "./GcpSyncFields";
|
import { GcpSyncFields } from "./GcpSyncFields";
|
||||||
import { GitHubSyncFields } from "./GitHubSyncFields";
|
import { GitHubSyncFields } from "./GitHubSyncFields";
|
||||||
|
import { HumanitecSyncFields } from "./HumanitecSyncFields";
|
||||||
|
|
||||||
export const SecretSyncDestinationFields = () => {
|
export const SecretSyncDestinationFields = () => {
|
||||||
const { watch } = useFormContext<TSecretSyncForm>();
|
const { watch } = useFormContext<TSecretSyncForm>();
|
||||||
@@ -31,6 +32,8 @@ export const SecretSyncDestinationFields = () => {
|
|||||||
return <AzureAppConfigurationSyncFields />;
|
return <AzureAppConfigurationSyncFields />;
|
||||||
case SecretSync.Databricks:
|
case SecretSync.Databricks:
|
||||||
return <DatabricksSyncFields />;
|
return <DatabricksSyncFields />;
|
||||||
|
case SecretSync.Humanitec:
|
||||||
|
return <HumanitecSyncFields />;
|
||||||
default:
|
default:
|
||||||
throw new Error(`Unhandled Destination Config Field: ${destination}`);
|
throw new Error(`Unhandled Destination Config Field: ${destination}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ export const SecretSyncOptionsFields = ({ hideInitialSync }: Props) => {
|
|||||||
case SecretSync.AzureKeyVault:
|
case SecretSync.AzureKeyVault:
|
||||||
case SecretSync.AzureAppConfiguration:
|
case SecretSync.AzureAppConfiguration:
|
||||||
case SecretSync.Databricks:
|
case SecretSync.Databricks:
|
||||||
|
case SecretSync.Humanitec:
|
||||||
AdditionalSyncOptionsFieldsComponent = null;
|
AdditionalSyncOptionsFieldsComponent = null;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import { useFormContext } from "react-hook-form";
|
||||||
|
|
||||||
|
import { SecretSyncLabel } from "@app/components/secret-syncs";
|
||||||
|
import { TSecretSyncForm } from "@app/components/secret-syncs/forms/schemas";
|
||||||
|
import { SecretSync } from "@app/hooks/api/secretSyncs";
|
||||||
|
|
||||||
|
export const HumanitecSyncReviewFields = () => {
|
||||||
|
const { watch } = useFormContext<TSecretSyncForm & { destination: SecretSync.Humanitec }>();
|
||||||
|
const orgId = watch("destinationConfig.org");
|
||||||
|
const appId = watch("destinationConfig.app");
|
||||||
|
const envId = watch("destinationConfig.env");
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<SecretSyncLabel label="Organization">{orgId}</SecretSyncLabel>
|
||||||
|
<SecretSyncLabel label="App">{appId}</SecretSyncLabel>
|
||||||
|
<SecretSyncLabel label="Environment">{envId}</SecretSyncLabel>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -20,6 +20,7 @@ import { AzureKeyVaultSyncReviewFields } from "./AzureKeyVaultSyncReviewFields";
|
|||||||
import { DatabricksSyncReviewFields } from "./DatabricksSyncReviewFields";
|
import { DatabricksSyncReviewFields } from "./DatabricksSyncReviewFields";
|
||||||
import { GcpSyncReviewFields } from "./GcpSyncReviewFields";
|
import { GcpSyncReviewFields } from "./GcpSyncReviewFields";
|
||||||
import { GitHubSyncReviewFields } from "./GitHubSyncReviewFields";
|
import { GitHubSyncReviewFields } from "./GitHubSyncReviewFields";
|
||||||
|
import { HumanitecSyncReviewFields } from "./HumanitecSyncReviewFields";
|
||||||
|
|
||||||
export const SecretSyncReviewFields = () => {
|
export const SecretSyncReviewFields = () => {
|
||||||
const { watch } = useFormContext<TSecretSyncForm>();
|
const { watch } = useFormContext<TSecretSyncForm>();
|
||||||
@@ -67,6 +68,9 @@ export const SecretSyncReviewFields = () => {
|
|||||||
case SecretSync.Databricks:
|
case SecretSync.Databricks:
|
||||||
DestinationFieldsComponent = <DatabricksSyncReviewFields />;
|
DestinationFieldsComponent = <DatabricksSyncReviewFields />;
|
||||||
break;
|
break;
|
||||||
|
case SecretSync.Humanitec:
|
||||||
|
DestinationFieldsComponent = <HumanitecSyncReviewFields />;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new Error(`Unhandled Destination Review Fields: ${destination}`);
|
throw new Error(`Unhandled Destination Review Fields: ${destination}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import { BaseSecretSyncSchema } from "@app/components/secret-syncs/forms/schemas/base-secret-sync-schema";
|
||||||
|
import { SecretSync } from "@app/hooks/api/secretSyncs";
|
||||||
|
|
||||||
|
export const HumanitecSyncDestinationSchema = BaseSecretSyncSchema().merge(
|
||||||
|
z.object({
|
||||||
|
destination: z.literal(SecretSync.Humanitec),
|
||||||
|
destinationConfig: z.object({
|
||||||
|
org: z.string().trim().min(1, "Organization required"),
|
||||||
|
app: z.string().trim().min(1, "App required"),
|
||||||
|
env: z.string().trim().min(1, "Environment required")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
);
|
||||||
@@ -8,6 +8,7 @@ import { AwsParameterStoreSyncDestinationSchema } from "./aws-parameter-store-sy
|
|||||||
import { AzureAppConfigurationSyncDestinationSchema } from "./azure-app-configuration-sync-destination-schema";
|
import { AzureAppConfigurationSyncDestinationSchema } from "./azure-app-configuration-sync-destination-schema";
|
||||||
import { AzureKeyVaultSyncDestinationSchema } from "./azure-key-vault-sync-destination-schema";
|
import { AzureKeyVaultSyncDestinationSchema } from "./azure-key-vault-sync-destination-schema";
|
||||||
import { GcpSyncDestinationSchema } from "./gcp-sync-destination-schema";
|
import { GcpSyncDestinationSchema } from "./gcp-sync-destination-schema";
|
||||||
|
import { HumanitecSyncDestinationSchema } from "./humanitec-sync-destination-schema";
|
||||||
|
|
||||||
const SecretSyncUnionSchema = z.discriminatedUnion("destination", [
|
const SecretSyncUnionSchema = z.discriminatedUnion("destination", [
|
||||||
AwsParameterStoreSyncDestinationSchema,
|
AwsParameterStoreSyncDestinationSchema,
|
||||||
@@ -16,7 +17,8 @@ const SecretSyncUnionSchema = z.discriminatedUnion("destination", [
|
|||||||
GcpSyncDestinationSchema,
|
GcpSyncDestinationSchema,
|
||||||
AzureKeyVaultSyncDestinationSchema,
|
AzureKeyVaultSyncDestinationSchema,
|
||||||
AzureAppConfigurationSyncDestinationSchema,
|
AzureAppConfigurationSyncDestinationSchema,
|
||||||
DatabricksSyncDestinationSchema
|
DatabricksSyncDestinationSchema,
|
||||||
|
HumanitecSyncDestinationSchema
|
||||||
]);
|
]);
|
||||||
|
|
||||||
export const SecretSyncFormSchema = SecretSyncUnionSchema;
|
export const SecretSyncFormSchema = SecretSyncUnionSchema;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
TAppConnection
|
TAppConnection
|
||||||
} from "@app/hooks/api/appConnections/types";
|
} from "@app/hooks/api/appConnections/types";
|
||||||
import { DatabricksConnectionMethod } from "@app/hooks/api/appConnections/types/databricks-connection";
|
import { DatabricksConnectionMethod } from "@app/hooks/api/appConnections/types/databricks-connection";
|
||||||
|
import { HumanitecConnectionMethod } from "@app/hooks/api/appConnections/types/humanitec-connection";
|
||||||
|
|
||||||
export const APP_CONNECTION_MAP: Record<AppConnection, { name: string; image: string }> = {
|
export const APP_CONNECTION_MAP: Record<AppConnection, { name: string; image: string }> = {
|
||||||
[AppConnection.AWS]: { name: "AWS", image: "Amazon Web Services.png" },
|
[AppConnection.AWS]: { name: "AWS", image: "Amazon Web Services.png" },
|
||||||
@@ -24,7 +25,8 @@ export const APP_CONNECTION_MAP: Record<AppConnection, { name: string; image: st
|
|||||||
name: "Azure App Configuration",
|
name: "Azure App Configuration",
|
||||||
image: "Microsoft Azure.png"
|
image: "Microsoft Azure.png"
|
||||||
},
|
},
|
||||||
[AppConnection.Databricks]: { name: "Databricks", image: "Databricks.png" }
|
[AppConnection.Databricks]: { name: "Databricks", image: "Databricks.png" },
|
||||||
|
[AppConnection.Humanitec]: { name: "Humanitec", image: "Humanitec.png" }
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getAppConnectionMethodDetails = (method: TAppConnection["method"]) => {
|
export const getAppConnectionMethodDetails = (method: TAppConnection["method"]) => {
|
||||||
@@ -43,6 +45,8 @@ export const getAppConnectionMethodDetails = (method: TAppConnection["method"])
|
|||||||
return { name: "Service Account Impersonation", icon: faUser };
|
return { name: "Service Account Impersonation", icon: faUser };
|
||||||
case DatabricksConnectionMethod.ServicePrincipal:
|
case DatabricksConnectionMethod.ServicePrincipal:
|
||||||
return { name: "Service Principal", icon: faUser };
|
return { name: "Service Principal", icon: faUser };
|
||||||
|
case HumanitecConnectionMethod.AccessKey:
|
||||||
|
return { name: "Access Key", icon: faKey };
|
||||||
default:
|
default:
|
||||||
throw new Error(`Unhandled App Connection Method: ${method}`);
|
throw new Error(`Unhandled App Connection Method: ${method}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ export const SECRET_SYNC_MAP: Record<SecretSync, { name: string; image: string }
|
|||||||
[SecretSync.Databricks]: {
|
[SecretSync.Databricks]: {
|
||||||
name: "Databricks",
|
name: "Databricks",
|
||||||
image: "Databricks.png"
|
image: "Databricks.png"
|
||||||
|
},
|
||||||
|
[SecretSync.Humanitec]: {
|
||||||
|
name: "Humanitec",
|
||||||
|
image: "Humanitec.png"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -28,7 +32,8 @@ export const SECRET_SYNC_CONNECTION_MAP: Record<SecretSync, AppConnection> = {
|
|||||||
[SecretSync.GCPSecretManager]: AppConnection.GCP,
|
[SecretSync.GCPSecretManager]: AppConnection.GCP,
|
||||||
[SecretSync.AzureKeyVault]: AppConnection.AzureKeyVault,
|
[SecretSync.AzureKeyVault]: AppConnection.AzureKeyVault,
|
||||||
[SecretSync.AzureAppConfiguration]: AppConnection.AzureAppConfiguration,
|
[SecretSync.AzureAppConfiguration]: AppConnection.AzureAppConfiguration,
|
||||||
[SecretSync.Databricks]: AppConnection.Databricks
|
[SecretSync.Databricks]: AppConnection.Databricks,
|
||||||
|
[SecretSync.Humanitec]: AppConnection.Humanitec
|
||||||
};
|
};
|
||||||
|
|
||||||
export const SECRET_SYNC_INITIAL_SYNC_BEHAVIOR_MAP: Record<
|
export const SECRET_SYNC_INITIAL_SYNC_BEHAVIOR_MAP: Record<
|
||||||
|
|||||||
@@ -4,5 +4,6 @@ export enum AppConnection {
|
|||||||
GCP = "gcp",
|
GCP = "gcp",
|
||||||
AzureKeyVault = "azure-key-vault",
|
AzureKeyVault = "azure-key-vault",
|
||||||
AzureAppConfiguration = "azure-app-configuration",
|
AzureAppConfiguration = "azure-app-configuration",
|
||||||
Databricks = "databricks"
|
Databricks = "databricks",
|
||||||
|
Humanitec = "humanitec"
|
||||||
}
|
}
|
||||||
|
|||||||
2
frontend/src/hooks/api/appConnections/humanitec/index.ts
Normal file
2
frontend/src/hooks/api/appConnections/humanitec/index.ts
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
export * from "./queries";
|
||||||
|
export * from "./types";
|
||||||
37
frontend/src/hooks/api/appConnections/humanitec/queries.tsx
Normal file
37
frontend/src/hooks/api/appConnections/humanitec/queries.tsx
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import { useQuery, UseQueryOptions } from "@tanstack/react-query";
|
||||||
|
|
||||||
|
import { apiRequest } from "@app/config/request";
|
||||||
|
|
||||||
|
import { appConnectionKeys } from "../queries";
|
||||||
|
import { THumanitecOrganization } from "./types";
|
||||||
|
|
||||||
|
const humanitecConnectionKeys = {
|
||||||
|
all: [...appConnectionKeys.all, "humanitec"] as const,
|
||||||
|
listOrganizations: (connectionId: string) =>
|
||||||
|
[...humanitecConnectionKeys.all, "organizations", connectionId] as const
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useHumanitecConnectionListOrganizations = (
|
||||||
|
connectionId: string,
|
||||||
|
options?: Omit<
|
||||||
|
UseQueryOptions<
|
||||||
|
THumanitecOrganization[],
|
||||||
|
unknown,
|
||||||
|
THumanitecOrganization[],
|
||||||
|
ReturnType<typeof humanitecConnectionKeys.listOrganizations>
|
||||||
|
>,
|
||||||
|
"queryKey" | "queryFn"
|
||||||
|
>
|
||||||
|
) => {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: humanitecConnectionKeys.listOrganizations(connectionId),
|
||||||
|
queryFn: async () => {
|
||||||
|
const { data } = await apiRequest.get<THumanitecOrganization[]>(
|
||||||
|
`/api/v1/app-connections/humanitec/${connectionId}/organizations`
|
||||||
|
);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
...options
|
||||||
|
});
|
||||||
|
};
|
||||||
15
frontend/src/hooks/api/appConnections/humanitec/types.ts
Normal file
15
frontend/src/hooks/api/appConnections/humanitec/types.ts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
export type THumanitecOrganization = {
|
||||||
|
name: string;
|
||||||
|
id: string;
|
||||||
|
apps: THumanitecApp[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export type THumanitecApp = {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
envs: { id: string; name: string }[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export type THumanitecConnectionApp = {
|
||||||
|
id: string;
|
||||||
|
};
|
||||||
@@ -34,6 +34,10 @@ export type TDatabricksConnectionOption = TAppConnectionOptionBase & {
|
|||||||
app: AppConnection.Databricks;
|
app: AppConnection.Databricks;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type THumanitecConnectionOption = TAppConnectionOptionBase & {
|
||||||
|
app: AppConnection.Humanitec;
|
||||||
|
};
|
||||||
|
|
||||||
export type TAppConnectionOption =
|
export type TAppConnectionOption =
|
||||||
| TAwsConnectionOption
|
| TAwsConnectionOption
|
||||||
| TGitHubConnectionOption
|
| TGitHubConnectionOption
|
||||||
@@ -49,4 +53,5 @@ export type TAppConnectionOptionMap = {
|
|||||||
[AppConnection.AzureKeyVault]: TAzureKeyVaultConnectionOption;
|
[AppConnection.AzureKeyVault]: TAzureKeyVaultConnectionOption;
|
||||||
[AppConnection.AzureAppConfiguration]: TAzureAppConfigurationConnectionOption;
|
[AppConnection.AzureAppConfiguration]: TAzureAppConfigurationConnectionOption;
|
||||||
[AppConnection.Databricks]: TDatabricksConnectionOption;
|
[AppConnection.Databricks]: TDatabricksConnectionOption;
|
||||||
|
[AppConnection.Humanitec]: THumanitecConnectionOption;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
import { AppConnection } from "@app/hooks/api/appConnections/enums";
|
||||||
|
import { TRootAppConnection } from "@app/hooks/api/appConnections/types/root-connection";
|
||||||
|
|
||||||
|
export enum HumanitecConnectionMethod {
|
||||||
|
AccessKey = "access-key"
|
||||||
|
}
|
||||||
|
|
||||||
|
export type THumanitecConnection = TRootAppConnection & { app: AppConnection.Humanitec } & {
|
||||||
|
method: HumanitecConnectionMethod.AccessKey;
|
||||||
|
credentials: {
|
||||||
|
accessKeyId: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -3,6 +3,7 @@ import { TAppConnectionOption } from "@app/hooks/api/appConnections/types/app-op
|
|||||||
import { TAwsConnection } from "@app/hooks/api/appConnections/types/aws-connection";
|
import { TAwsConnection } from "@app/hooks/api/appConnections/types/aws-connection";
|
||||||
import { TDatabricksConnection } from "@app/hooks/api/appConnections/types/databricks-connection";
|
import { TDatabricksConnection } from "@app/hooks/api/appConnections/types/databricks-connection";
|
||||||
import { TGitHubConnection } from "@app/hooks/api/appConnections/types/github-connection";
|
import { TGitHubConnection } from "@app/hooks/api/appConnections/types/github-connection";
|
||||||
|
import { THumanitecConnection } from "@app/hooks/api/appConnections/types/humanitec-connection";
|
||||||
|
|
||||||
import { TAzureAppConfigurationConnection } from "./azure-app-configuration-connection";
|
import { TAzureAppConfigurationConnection } from "./azure-app-configuration-connection";
|
||||||
import { TAzureKeyVaultConnection } from "./azure-key-vault-connection";
|
import { TAzureKeyVaultConnection } from "./azure-key-vault-connection";
|
||||||
@@ -13,6 +14,7 @@ export * from "./azure-app-configuration-connection";
|
|||||||
export * from "./azure-key-vault-connection";
|
export * from "./azure-key-vault-connection";
|
||||||
export * from "./gcp-connection";
|
export * from "./gcp-connection";
|
||||||
export * from "./github-connection";
|
export * from "./github-connection";
|
||||||
|
export * from "./humanitec-connection";
|
||||||
|
|
||||||
export type TAppConnection =
|
export type TAppConnection =
|
||||||
| TAwsConnection
|
| TAwsConnection
|
||||||
@@ -20,7 +22,8 @@ export type TAppConnection =
|
|||||||
| TGcpConnection
|
| TGcpConnection
|
||||||
| TAzureKeyVaultConnection
|
| TAzureKeyVaultConnection
|
||||||
| TAzureAppConfigurationConnection
|
| TAzureAppConfigurationConnection
|
||||||
| TDatabricksConnection;
|
| TDatabricksConnection
|
||||||
|
| THumanitecConnection;
|
||||||
|
|
||||||
export type TAvailableAppConnection = Pick<TAppConnection, "name" | "id">;
|
export type TAvailableAppConnection = Pick<TAppConnection, "name" | "id">;
|
||||||
|
|
||||||
@@ -54,4 +57,5 @@ export type TAppConnectionMap = {
|
|||||||
[AppConnection.AzureKeyVault]: TAzureKeyVaultConnection;
|
[AppConnection.AzureKeyVault]: TAzureKeyVaultConnection;
|
||||||
[AppConnection.AzureAppConfiguration]: TAzureAppConfigurationConnection;
|
[AppConnection.AzureAppConfiguration]: TAzureAppConfigurationConnection;
|
||||||
[AppConnection.Databricks]: TDatabricksConnection;
|
[AppConnection.Databricks]: TDatabricksConnection;
|
||||||
|
[AppConnection.Humanitec]: THumanitecConnection;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ export enum SecretSync {
|
|||||||
GCPSecretManager = "gcp-secret-manager",
|
GCPSecretManager = "gcp-secret-manager",
|
||||||
AzureKeyVault = "azure-key-vault",
|
AzureKeyVault = "azure-key-vault",
|
||||||
AzureAppConfiguration = "azure-app-configuration",
|
AzureAppConfiguration = "azure-app-configuration",
|
||||||
Databricks = "databricks"
|
Databricks = "databricks",
|
||||||
|
Humanitec = "humanitec"
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum SecretSyncStatus {
|
export enum SecretSyncStatus {
|
||||||
|
|||||||
16
frontend/src/hooks/api/secretSyncs/types/humanitec-sync.ts
Normal file
16
frontend/src/hooks/api/secretSyncs/types/humanitec-sync.ts
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
import { AppConnection } from "@app/hooks/api/appConnections/enums";
|
||||||
|
import { SecretSync } from "@app/hooks/api/secretSyncs";
|
||||||
|
import { TRootSecretSync } from "@app/hooks/api/secretSyncs/types/root-sync";
|
||||||
|
|
||||||
|
export type THumanitecSync = TRootSecretSync & {
|
||||||
|
destination: SecretSync.Humanitec;
|
||||||
|
destinationConfig: {
|
||||||
|
org: string;
|
||||||
|
app: string;
|
||||||
|
};
|
||||||
|
connection: {
|
||||||
|
app: AppConnection.Humanitec;
|
||||||
|
name: string;
|
||||||
|
id: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -8,6 +8,7 @@ import { TAwsSecretsManagerSync } from "./aws-secrets-manager-sync";
|
|||||||
import { TAzureAppConfigurationSync } from "./azure-app-configuration-sync";
|
import { TAzureAppConfigurationSync } from "./azure-app-configuration-sync";
|
||||||
import { TAzureKeyVaultSync } from "./azure-key-vault-sync";
|
import { TAzureKeyVaultSync } from "./azure-key-vault-sync";
|
||||||
import { TGcpSync } from "./gcp-sync";
|
import { TGcpSync } from "./gcp-sync";
|
||||||
|
import { THumanitecSync } from "./humanitec-sync";
|
||||||
|
|
||||||
export type TSecretSyncOption = {
|
export type TSecretSyncOption = {
|
||||||
name: string;
|
name: string;
|
||||||
@@ -22,7 +23,8 @@ export type TSecretSync =
|
|||||||
| TGcpSync
|
| TGcpSync
|
||||||
| TAzureKeyVaultSync
|
| TAzureKeyVaultSync
|
||||||
| TAzureAppConfigurationSync
|
| TAzureAppConfigurationSync
|
||||||
| TDatabricksSync;
|
| TDatabricksSync
|
||||||
|
| THumanitecSync;
|
||||||
|
|
||||||
export type TListSecretSyncs = { secretSyncs: TSecretSync[] };
|
export type TListSecretSyncs = { secretSyncs: TSecretSync[] };
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { AzureKeyVaultConnectionForm } from "./AzureKeyVaultConnectionForm";
|
|||||||
import { DatabricksConnectionForm } from "./DatabricksConnectionForm";
|
import { DatabricksConnectionForm } from "./DatabricksConnectionForm";
|
||||||
import { GcpConnectionForm } from "./GcpConnectionForm";
|
import { GcpConnectionForm } from "./GcpConnectionForm";
|
||||||
import { GitHubConnectionForm } from "./GitHubConnectionForm";
|
import { GitHubConnectionForm } from "./GitHubConnectionForm";
|
||||||
|
import { HumanitecConnectionForm } from "./HumanitecConnectionForm";
|
||||||
|
|
||||||
type FormProps = {
|
type FormProps = {
|
||||||
onComplete: (appConnection: TAppConnection) => void;
|
onComplete: (appConnection: TAppConnection) => void;
|
||||||
@@ -62,6 +63,8 @@ const CreateForm = ({ app, onComplete }: CreateFormProps) => {
|
|||||||
return <AzureAppConfigurationConnectionForm />;
|
return <AzureAppConfigurationConnectionForm />;
|
||||||
case AppConnection.Databricks:
|
case AppConnection.Databricks:
|
||||||
return <DatabricksConnectionForm onSubmit={onSubmit} />;
|
return <DatabricksConnectionForm onSubmit={onSubmit} />;
|
||||||
|
case AppConnection.Humanitec:
|
||||||
|
return <HumanitecConnectionForm onSubmit={onSubmit} />;
|
||||||
default:
|
default:
|
||||||
throw new Error(`Unhandled App ${app}`);
|
throw new Error(`Unhandled App ${app}`);
|
||||||
}
|
}
|
||||||
@@ -107,6 +110,8 @@ const UpdateForm = ({ appConnection, onComplete }: UpdateFormProps) => {
|
|||||||
return <AzureAppConfigurationConnectionForm appConnection={appConnection} />;
|
return <AzureAppConfigurationConnectionForm appConnection={appConnection} />;
|
||||||
case AppConnection.Databricks:
|
case AppConnection.Databricks:
|
||||||
return <DatabricksConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
|
return <DatabricksConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
|
||||||
|
case AppConnection.Humanitec:
|
||||||
|
return <HumanitecConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
|
||||||
default:
|
default:
|
||||||
throw new Error(`Unhandled App ${(appConnection as TAppConnection).app}`);
|
throw new Error(`Unhandled App ${(appConnection as TAppConnection).app}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,132 @@
|
|||||||
|
import { Controller, FormProvider, useForm } from "react-hook-form";
|
||||||
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import {
|
||||||
|
Button,
|
||||||
|
FormControl,
|
||||||
|
ModalClose,
|
||||||
|
SecretInput,
|
||||||
|
Select,
|
||||||
|
SelectItem
|
||||||
|
} from "@app/components/v2";
|
||||||
|
import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
|
||||||
|
import { HumanitecConnectionMethod, THumanitecConnection } from "@app/hooks/api/appConnections";
|
||||||
|
import { AppConnection } from "@app/hooks/api/appConnections/enums";
|
||||||
|
|
||||||
|
import {
|
||||||
|
genericAppConnectionFieldsSchema,
|
||||||
|
GenericAppConnectionsFields
|
||||||
|
} from "./GenericAppConnectionFields";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
appConnection?: THumanitecConnection;
|
||||||
|
onSubmit: (formData: FormData) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
const rootSchema = genericAppConnectionFieldsSchema.extend({
|
||||||
|
app: z.literal(AppConnection.Humanitec)
|
||||||
|
});
|
||||||
|
|
||||||
|
const formSchema = z.discriminatedUnion("method", [
|
||||||
|
rootSchema.extend({
|
||||||
|
method: z.literal(HumanitecConnectionMethod.AccessKey),
|
||||||
|
credentials: z.object({
|
||||||
|
accessKeyId: z.string().trim().min(1, "Service API Token required")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
]);
|
||||||
|
|
||||||
|
type FormData = z.infer<typeof formSchema>;
|
||||||
|
|
||||||
|
export const HumanitecConnectionForm = ({ appConnection, onSubmit }: Props) => {
|
||||||
|
const isUpdate = Boolean(appConnection);
|
||||||
|
|
||||||
|
const form = useForm<FormData>({
|
||||||
|
resolver: zodResolver(formSchema),
|
||||||
|
defaultValues: appConnection ?? {
|
||||||
|
app: AppConnection.Humanitec,
|
||||||
|
method: HumanitecConnectionMethod.AccessKey
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const {
|
||||||
|
handleSubmit,
|
||||||
|
control,
|
||||||
|
formState: { isSubmitting, isDirty }
|
||||||
|
} = form;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<FormProvider {...form}>
|
||||||
|
<form onSubmit={handleSubmit(onSubmit)}>
|
||||||
|
{!isUpdate && <GenericAppConnectionsFields />}
|
||||||
|
<Controller
|
||||||
|
name="method"
|
||||||
|
control={control}
|
||||||
|
render={({ field: { value, onChange }, fieldState: { error } }) => (
|
||||||
|
<FormControl
|
||||||
|
tooltipText={`The method you would like to use to connect with ${
|
||||||
|
APP_CONNECTION_MAP[AppConnection.AWS].name
|
||||||
|
}. This field cannot be changed after creation.`}
|
||||||
|
errorText={error?.message}
|
||||||
|
isError={Boolean(error?.message)}
|
||||||
|
label="Method"
|
||||||
|
>
|
||||||
|
<Select
|
||||||
|
isDisabled={isUpdate}
|
||||||
|
value={value}
|
||||||
|
onValueChange={(val) => onChange(val)}
|
||||||
|
className="w-full border border-mineshaft-500"
|
||||||
|
position="popper"
|
||||||
|
dropdownContainerClassName="max-w-none"
|
||||||
|
>
|
||||||
|
{Object.values(HumanitecConnectionMethod).map((method) => {
|
||||||
|
return (
|
||||||
|
<SelectItem value={method} key={method}>
|
||||||
|
{getAppConnectionMethodDetails(method).name}{" "}
|
||||||
|
</SelectItem>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Select>
|
||||||
|
</FormControl>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<Controller
|
||||||
|
name="credentials.accessKeyId"
|
||||||
|
control={control}
|
||||||
|
shouldUnregister
|
||||||
|
render={({ field: { value, onChange }, fieldState: { error } }) => (
|
||||||
|
<FormControl
|
||||||
|
errorText={error?.message}
|
||||||
|
isError={Boolean(error?.message)}
|
||||||
|
label="Service API Token"
|
||||||
|
>
|
||||||
|
<SecretInput
|
||||||
|
containerClassName="text-gray-400 group-focus-within:!border-primary-400/50 border border-mineshaft-500 bg-mineshaft-900 px-2.5 py-1.5"
|
||||||
|
value={value}
|
||||||
|
onChange={(e) => onChange(e.target.value)}
|
||||||
|
/>
|
||||||
|
</FormControl>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<div className="mt-8 flex items-center">
|
||||||
|
<Button
|
||||||
|
className="mr-4"
|
||||||
|
size="sm"
|
||||||
|
type="submit"
|
||||||
|
colorSchema="secondary"
|
||||||
|
isLoading={isSubmitting}
|
||||||
|
isDisabled={isSubmitting || !isDirty}
|
||||||
|
>
|
||||||
|
{isUpdate ? "Update Credentials" : "Connect to Humanitec"}
|
||||||
|
</Button>
|
||||||
|
<ModalClose asChild>
|
||||||
|
<Button colorSchema="secondary" variant="plain">
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
</ModalClose>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</FormProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { THumanitecSync } from "@app/hooks/api/secretSyncs/types/humanitec-sync";
|
||||||
|
|
||||||
|
import { getSecretSyncDestinationColValues } from "../helpers";
|
||||||
|
import { SecretSyncTableCell } from "../SecretSyncTableCell";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
secretSync: THumanitecSync;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const HumanitecSyncDestinationCol = ({ secretSync }: Props) => {
|
||||||
|
const { primaryText, secondaryText } = getSecretSyncDestinationColValues(secretSync);
|
||||||
|
|
||||||
|
return <SecretSyncTableCell primaryText={primaryText} secondaryText={secondaryText} />;
|
||||||
|
};
|
||||||
@@ -7,6 +7,7 @@ import { AzureKeyVaultDestinationSyncCol } from "./AzureKeyVaultDestinationSyncC
|
|||||||
import { DatabricksSyncDestinationCol } from "./DatabricksSyncDestinationCol";
|
import { DatabricksSyncDestinationCol } from "./DatabricksSyncDestinationCol";
|
||||||
import { GcpSyncDestinationCol } from "./GcpSyncDestinationCol";
|
import { GcpSyncDestinationCol } from "./GcpSyncDestinationCol";
|
||||||
import { GitHubSyncDestinationCol } from "./GitHubSyncDestinationCol";
|
import { GitHubSyncDestinationCol } from "./GitHubSyncDestinationCol";
|
||||||
|
import { HumanitecSyncDestinationCol } from "./HumanitecSyncDestinationCol";
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
secretSync: TSecretSync;
|
secretSync: TSecretSync;
|
||||||
@@ -28,6 +29,8 @@ export const SecretSyncDestinationCol = ({ secretSync }: Props) => {
|
|||||||
return <AzureAppConfigurationDestinationSyncCol secretSync={secretSync} />;
|
return <AzureAppConfigurationDestinationSyncCol secretSync={secretSync} />;
|
||||||
case SecretSync.Databricks:
|
case SecretSync.Databricks:
|
||||||
return <DatabricksSyncDestinationCol secretSync={secretSync} />;
|
return <DatabricksSyncDestinationCol secretSync={secretSync} />;
|
||||||
|
case SecretSync.Humanitec:
|
||||||
|
return <HumanitecSyncDestinationCol secretSync={secretSync} />;
|
||||||
default:
|
default:
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Unhandled Secret Sync Destination Col: ${(secretSync as TSecretSync).destination}`
|
`Unhandled Secret Sync Destination Col: ${(secretSync as TSecretSync).destination}`
|
||||||
|
|||||||
@@ -59,6 +59,10 @@ export const getSecretSyncDestinationColValues = (secretSync: TSecretSync) => {
|
|||||||
case SecretSync.Databricks:
|
case SecretSync.Databricks:
|
||||||
primaryText = destinationConfig.scope;
|
primaryText = destinationConfig.scope;
|
||||||
break;
|
break;
|
||||||
|
case SecretSync.Humanitec:
|
||||||
|
primaryText = destinationConfig.app;
|
||||||
|
secondaryText = `Org - ${destinationConfig.org}`;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new Error(`Unhandled Destination Col Values ${destination}`);
|
throw new Error(`Unhandled Destination Col Values ${destination}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import { SecretSyncLabel } from "@app/components/secret-syncs";
|
||||||
|
import { THumanitecSync } from "@app/hooks/api/secretSyncs/types/humanitec-sync";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
secretSync: THumanitecSync;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const HumanitecSyncDestinationSection = ({ secretSync }: Props) => {
|
||||||
|
const {
|
||||||
|
destinationConfig: { app, org }
|
||||||
|
} = secretSync;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<SecretSyncLabel label="App">{app}</SecretSyncLabel>
|
||||||
|
<SecretSyncLabel label="Org">{org}</SecretSyncLabel>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -17,6 +17,7 @@ import { GitHubSyncDestinationSection } from "@app/pages/secret-manager/SecretSy
|
|||||||
import { AzureAppConfigurationSyncDestinationSection } from "./AzureAppConfigurationSyncDestinationSection";
|
import { AzureAppConfigurationSyncDestinationSection } from "./AzureAppConfigurationSyncDestinationSection";
|
||||||
import { AzureKeyVaultSyncDestinationSection } from "./AzureKeyVaultSyncDestinationSection";
|
import { AzureKeyVaultSyncDestinationSection } from "./AzureKeyVaultSyncDestinationSection";
|
||||||
import { GcpSyncDestinationSection } from "./GcpSyncDestinationSection";
|
import { GcpSyncDestinationSection } from "./GcpSyncDestinationSection";
|
||||||
|
import { HumanitecSyncDestinationSection } from "./HumanitecSyncDestinationSection";
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
secretSync: TSecretSync;
|
secretSync: TSecretSync;
|
||||||
@@ -53,6 +54,9 @@ export const SecretSyncDestinationSection = ({ secretSync, onEditDestination }:
|
|||||||
case SecretSync.Databricks:
|
case SecretSync.Databricks:
|
||||||
DestinationComponents = <DatabricksSyncDestinationSection secretSync={secretSync} />;
|
DestinationComponents = <DatabricksSyncDestinationSection secretSync={secretSync} />;
|
||||||
break;
|
break;
|
||||||
|
case SecretSync.Humanitec:
|
||||||
|
DestinationComponents = <HumanitecSyncDestinationSection secretSync={secretSync} />;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new Error(`Unhandled Destination Section components: ${destination}`);
|
throw new Error(`Unhandled Destination Section components: ${destination}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ export const SecretSyncOptionsSection = ({ secretSync, onEditOptions }: Props) =
|
|||||||
case SecretSync.AzureKeyVault:
|
case SecretSync.AzureKeyVault:
|
||||||
case SecretSync.AzureAppConfiguration:
|
case SecretSync.AzureAppConfiguration:
|
||||||
case SecretSync.Databricks:
|
case SecretSync.Databricks:
|
||||||
|
case SecretSync.Humanitec:
|
||||||
AdditionalSyncOptionsComponent = null;
|
AdditionalSyncOptionsComponent = null;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
Reference in New Issue
Block a user