Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

Merge remote-tracking branch 'origin/main' into PAM-455

Andreycdc33964c9c1
diff --cc backend/src/server/routes/v1/app-connection-routers/app-connection-router.ts
index d189612f03,a3a04185b8..efc686aea2
--- a/backend/src/server/routes/v1/app-connection-routers/app-connection-router.ts
+++ b/backend/src/server/routes/v1/app-connection-routers/app-connection-router.ts
@@@ -368,8 -365,8 +369,9 @@@ const SanitizedAppConnectionSchema = z.
...SanitizedSpaceliftConnectionSchema.options,
...SanitizedDaytonaConnectionSchema.options,
...SanitizedStripeConnectionSchema.options,
+ ...SanitizedKeeperConnectionSchema.options,
- ...SanitizedHpeIloConnectionSchema.options
+ ...SanitizedHpeIloConnectionSchema.options,
+ ...SanitizedS3CompatibleConnectionSchema.options
]);
const AppConnectionOptionsSchema = z.discriminatedUnion("app", [
@@@ -460,8 -457,8 +462,9 @@@
SpaceliftConnectionListItemSchema,
DaytonaConnectionListItemSchema,
StripeConnectionListItemSchema,
+ KeeperConnectionListItemSchema,
- HpeIloConnectionListItemSchema
+ HpeIloConnectionListItemSchema,
+ S3CompatibleConnectionListItemSchema
]);
export const registerAppConnectionRouter = async (server: FastifyZodProvider) => {
diff --cc backend/src/server/routes/v1/app-connection-routers/index.ts
index 4efa34335c,b4a3f12ebe..f92dfeddd9
--- a/backend/src/server/routes/v1/app-connection-routers/index.ts
+++ b/backend/src/server/routes/v1/app-connection-routers/index.ts
@@@ -181,6 -181,6 +182,7 @@@ export const APP_CONNECTION_REGISTER_RO
[AppConnection.Spacelift]: registerSpaceliftConnectionRouter,
[AppConnection.Daytona]: registerDaytonaConnectionRouter,
[AppConnection.Stripe]: registerStripeConnectionRouter,
+ [AppConnection.Keeper]: registerKeeperConnectionRouter,
- [AppConnection.HpeIloRedFish]: registerHpeIloConnectionRouter
+ [AppConnection.HpeIloRedFish]: registerHpeIloConnectionRouter,
+ [AppConnection.S3Compatible]: registerS3CompatibleConnectionRouter
};
diff --cc backend/src/services/app-connection/app-connection-enums.ts
index be9ece24fd,62d57e18a9..89c5a66881
--- a/backend/src/services/app-connection/app-connection-enums.ts
+++ b/backend/src/services/app-connection/app-connection-enums.ts
@@@ -86,8 -86,8 +86,9 @@@ export enum AppConnection
Spacelift = "spacelift",
Daytona = "daytona",
Stripe = "stripe",
+ Keeper = "keeper",
- HpeIloRedFish = "hpe-ilo"
+ HpeIloRedFish = "hpe-ilo",
+ S3Compatible = "s3-compatible"
}
export enum AWSRegion {
diff --cc backend/src/services/app-connection/app-connection-fns.ts
index 6a3fc09652,8c959d5e84..97552aefe5
--- a/backend/src/services/app-connection/app-connection-fns.ts
+++ b/backend/src/services/app-connection/app-connection-fns.ts
@@@ -480,8 -476,8 +481,9 @@@ export const listAppConnectionOptions
getSpaceliftConnectionListItem(),
getDaytonaConnectionListItem(),
getStripeConnectionListItem(),
+ getKeeperConnectionListItem(),
- getHpeIloConnectionListItem()
+ getHpeIloConnectionListItem(),
+ getS3CompatibleConnectionListItem()
]
.filter((option) => isAppConnectionAllowedInProject(option.app, projectType))
.sort((a, b) => a.name.localeCompare(b.name));
@@@ -719,8 -715,8 +721,9 @@@ export const validateAppConnectionCrede
[AppConnection.Spacelift]: validateSpaceliftConnectionCredentials as TAppConnectionCredentialsValidator,
[AppConnection.Daytona]: validateDaytonaConnectionCredentials as TAppConnectionCredentialsValidator,
[AppConnection.Stripe]: validateStripeConnectionCredentials as TAppConnectionCredentialsValidator,
+ [AppConnection.Keeper]: validateKeeperConnectionCredentials as TAppConnectionCredentialsValidator,
- [AppConnection.HpeIloRedFish]: validateHpeIloConnectionCredentials as TAppConnectionCredentialsValidator
+ [AppConnection.HpeIloRedFish]: validateHpeIloConnectionCredentials as TAppConnectionCredentialsValidator,
+ [AppConnection.S3Compatible]: validateS3CompatibleConnectionCredentials as TAppConnectionCredentialsValidator
};
return VALIDATE_APP_CONNECTION_CREDENTIALS_MAP[appConnection.app](appConnection, gatewayV2Service);
@@@ -1001,8 -997,8 +1005,9 @@@ export const TRANSITION_CONNECTION_CRED
[AppConnection.Spacelift]: platformManagedCredentialsNotSupported,
[AppConnection.Daytona]: platformManagedCredentialsNotSupported,
[AppConnection.Stripe]: platformManagedCredentialsNotSupported,
+ [AppConnection.Keeper]: platformManagedCredentialsNotSupported,
- [AppConnection.HpeIloRedFish]: platformManagedCredentialsNotSupported
+ [AppConnection.HpeIloRedFish]: platformManagedCredentialsNotSupported,
+ [AppConnection.S3Compatible]: platformManagedCredentialsNotSupported
};
export const enterpriseAppCheck = async (
diff --cc backend/src/services/app-connection/app-connection-maps.ts
index 7f46382fde,7e086df146..ded37beb90
--- a/backend/src/services/app-connection/app-connection-maps.ts
+++ b/backend/src/services/app-connection/app-connection-maps.ts
@@@ -88,8 -88,8 +88,9 @@@ export const APP_CONNECTION_NAME_MAP: R
[AppConnection.Daytona]: "Daytona",
[AppConnection.MicrosoftIntune]: "Microsoft Intune",
[AppConnection.Stripe]: "Stripe",
+ [AppConnection.Keeper]: "Keeper",
- [AppConnection.HpeIloRedFish]: "HPE iLO"
+ [AppConnection.HpeIloRedFish]: "HPE iLO",
+ [AppConnection.S3Compatible]: "S3-Compatible Storage"
};
export const APP_CONNECTION_PLAN_MAP: Record<AppConnection, AppConnectionPlanType> = {
@@@ -180,6 -180,6 +181,7 @@@
[AppConnection.Daytona]: AppConnectionPlanType.Regular,
[AppConnection.MicrosoftIntune]: AppConnectionPlanType.Enterprise,
[AppConnection.Stripe]: AppConnectionPlanType.Regular,
+ [AppConnection.Keeper]: AppConnectionPlanType.Regular,
- [AppConnection.HpeIloRedFish]: AppConnectionPlanType.Regular
+ [AppConnection.HpeIloRedFish]: AppConnectionPlanType.Regular,
+ [AppConnection.S3Compatible]: AppConnectionPlanType.Regular
};
diff --cc backend/src/services/app-connection/app-connection-service.ts
index 630701c765,0ee7e65120..e596ca8dd1
--- a/backend/src/services/app-connection/app-connection-service.ts
+++ b/backend/src/services/app-connection/app-connection-service.ts
@@@ -324,8 -325,8 +326,9 @@@ const VALIDATE_APP_CONNECTION_CREDENTIA
[AppConnection.Spacelift]: ValidateSpaceliftConnectionCredentialsSchema,
[AppConnection.Daytona]: ValidateDaytonaConnectionCredentialsSchema,
[AppConnection.Stripe]: ValidateStripeConnectionCredentialsSchema,
+ [AppConnection.Keeper]: ValidateKeeperConnectionCredentialsSchema,
- [AppConnection.HpeIloRedFish]: ValidateHpeIloConnectionCredentialsSchema
+ [AppConnection.HpeIloRedFish]: ValidateHpeIloConnectionCredentialsSchema,
+ [AppConnection.S3Compatible]: ValidateS3CompatibleConnectionCredentialsSchema
};
export const appConnectionServiceFactory = ({
diff --cc backend/src/services/app-connection/app-connection-types.ts
index 0a2ffdc54e,f6b923d8c3..360e806ecc
--- a/backend/src/services/app-connection/app-connection-types.ts
+++ b/backend/src/services/app-connection/app-connection-types.ts
@@@ -617,8 -617,8 +623,9 @@@ export type TAppConnection = { id: stri
| TSpaceliftConnection
| TDaytonaConnection
| TStripeConnection
+ | TKeeperConnection
| THpeIloConnection
+ | TS3CompatibleConnection
);
export type TAppConnectionRaw = NonNullable<Awaited<ReturnType<TAppConnectionDALFactory["findById"]>>>;
@@@ -717,8 -717,8 +724,9 @@@ export type TAppConnectionInput = { id
| TSpaceliftConnectionInput
| TDaytonaConnectionInput
| TStripeConnectionInput
+ | TKeeperConnectionInput
| THpeIloConnectionInput
+ | TS3CompatibleConnectionInput
);
export type TSqlConnectionInput =
@@@ -851,8 -851,8 +859,9 @@@ export type TAppConnectionConfig
| TSpaceliftConnectionConfig
| TDaytonaConnectionConfig
| TStripeConnectionConfig
+ | TKeeperConnectionConfig
- | THpeIloConnectionConfig;
+ | THpeIloConnectionConfig
+ | TS3CompatibleConnectionConfig;
export type TValidateAppConnectionCredentialsSchema =
| TValidateAwsConnectionCredentialsSchema
@@@ -942,8 -942,8 +951,9 @@@
| TValidateSpaceliftConnectionCredentialsSchema
| TValidateDaytonaConnectionCredentialsSchema
| TValidateStripeConnectionCredentialsSchema
+ | TValidateKeeperConnectionCredentialsSchema
- | TValidateHpeIloConnectionCredentialsSchema;
+ | TValidateHpeIloConnectionCredentialsSchema
+ | TValidateS3CompatibleConnectionCredentialsSchema;
export type TListAwsConnectionKmsKeys = {
connectionId: string;
diff --cc frontend/src/hooks/api/appConnections/enums.ts
index 6bcb2ef172,f679f2d49a..0b61277316
--- a/frontend/src/hooks/api/appConnections/enums.ts
+++ b/frontend/src/hooks/api/appConnections/enums.ts
@@@ -86,6 -86,6 +86,7 @@@ export enum AppConnection
Spacelift = "spacelift",
Daytona = "daytona",
Stripe = "stripe",
+ Keeper = "keeper",
- HpeIloRedFish = "hpe-ilo"
+ HpeIloRedFish = "hpe-ilo",
+ S3Compatible = "s3-compatible"
}
diff --cc frontend/src/hooks/api/appConnections/types/index.ts
index 1e53c78e61,06d36084f1..dc65e3c0fe
--- a/frontend/src/hooks/api/appConnections/types/index.ts
+++ b/frontend/src/hooks/api/appConnections/types/index.ts
@@@ -265,8 -265,8 +267,9 @@@ export type TAppConnection
| TSpaceliftConnection
| TDaytonaConnection
| TStripeConnection
+ | TKeeperConnection
- | THpeIloConnection;
+ | THpeIloConnection
+ | TS3CompatibleConnection;
export type TAvailableAppConnection = Pick<TAppConnection, "name" | "id" | "projectId">;