awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change overview dynamic secret creation modal to set only one env

Browse Source
This commit is contained in:
carlosmonastyrski
2025-03-14 14:59:19 -03:00
parent 94d7d2b029
commit 6905029455
15 changed files with 335 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/AwsElastiCacheInputForm.tsx
View File

@@ -53,7 +53,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -91,7 +91,7 @@ export const AwsElastiCacheInputForm = ({
"UserId": "{{username}}"
}`
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -102,33 +102,26 @@ export const AwsElastiCacheInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.AwsElastiCache, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
hasErrors = true;
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.AwsElastiCache, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -319,19 +312,18 @@ export const AwsElastiCacheInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
/>

51
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/AwsIamInputForm.tsx
View File

@@ -42,7 +42,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -68,7 +68,7 @@ export const AwsIamInputForm = ({
} = useForm<TForm>({
resolver: zodResolver(formSchema),
defaultValues: {
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -79,33 +79,27 @@ export const AwsIamInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.AwsIam, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
hasErrors = true;
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.AwsIam, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -307,19 +301,18 @@ export const AwsIamInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

70
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/AzureEntraIdInputForm.tsx
View File

@@ -62,7 +62,7 @@ const formSchema = z.object({
.string()
.min(1)
.refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -89,7 +89,7 @@ export const AzureEntraIdInputForm = ({
} = useForm<TForm>({
resolver: zodResolver(formSchema),
defaultValues: {
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
const tenantId = watch("provider.tenantId");
@@ -113,44 +113,37 @@ export const AzureEntraIdInputForm = ({
provider,
maxTTL,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
selectedUsers.map(async (user: { id: string; name: string; email: string }) => {
await createDynamicSecret.mutateAsync({
provider: {
type: DynamicSecretProviders.AzureEntraId,
inputs: {
userId: user.id,
tenantId: provider.tenantId,
email: user.email,
applicationId: provider.applicationId,
clientSecret: provider.clientSecret
}
},
maxTTL,
name: `${name}-${user.name}`,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
try {
selectedUsers.map(async (user: { id: string; name: string; email: string }) => {
await createDynamicSecret.mutateAsync({
provider: {
type: DynamicSecretProviders.AzureEntraId,
inputs: {
userId: user.id,
tenantId: provider.tenantId,
email: user.email,
applicationId: provider.applicationId,
clientSecret: provider.clientSecret
}
},
maxTTL,
name: `${name}-${user.name}`,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -389,19 +382,18 @@ export const AzureEntraIdInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

51
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/CassandraInputForm.tsx
View File

@@ -55,7 +55,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -91,7 +91,7 @@ export const CassandraInputForm = ({
resolver: zodResolver(formSchema),
defaultValues: {
provider: getSqlStatements(),
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -102,33 +102,27 @@ export const CassandraInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Cassandra, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Cassandra, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -365,19 +359,18 @@ export const CassandraInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

50
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/ElasticSearchInputForm.tsx
View File

@@ -76,7 +76,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -111,7 +111,7 @@ export const ElasticSearchInputForm = ({
roles: ["superuser"],
port: 443
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -122,33 +122,26 @@ export const ElasticSearchInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.ElasticSearch, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.ElasticSearch, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -426,19 +419,18 @@ export const ElasticSearchInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

50
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/LdapInputForm.tsx
View File

@@ -79,7 +79,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -118,7 +118,7 @@ export const LdapInputForm = ({
rollbackLdif: "",
credentialType: CredentialType.Dynamic
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -131,33 +131,26 @@ export const LdapInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Ldap, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Ldap, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -396,19 +389,18 @@ export const LdapInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

50
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/MongoAtlasInputForm.tsx
View File

@@ -66,7 +66,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -112,7 +112,7 @@ export const MongoAtlasInputForm = ({
provider: {
roles: [{ databaseName: "", roleName: "" }]
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -133,33 +133,26 @@ export const MongoAtlasInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.MongoAtlas, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.MongoAtlas, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -458,19 +451,18 @@ export const MongoAtlasInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

64
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/MongoDBInputForm.tsx
View File

@@ -56,7 +56,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -87,7 +87,7 @@ export const MongoDBDatabaseInputForm = ({
provider: {
roles: [{ roleName: "readWrite" }]
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -103,40 +103,33 @@ export const MongoDBDatabaseInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: {
type: DynamicSecretProviders.MongoDB,
inputs: {
...provider,
port: provider?.port ? provider.port : undefined,
roles: provider.roles.map((el) => el.roleName)
}
},
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: {
type: DynamicSecretProviders.MongoDB,
inputs: {
...provider,
port: provider?.port ? provider.port : undefined,
roles: provider.roles.map((el) => el.roleName)
}
},
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -348,19 +341,18 @@ export const MongoDBDatabaseInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

50
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/RabbitMqInputForm.tsx
View File

@@ -60,7 +60,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -100,7 +100,7 @@ export const RabbitMqInputForm = ({
},
tags: []
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -111,33 +111,26 @@ export const RabbitMqInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.RabbitMq, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.RabbitMq, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -432,19 +425,18 @@ export const RabbitMqInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

50
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/RedisInputForm.tsx
View File

@@ -53,7 +53,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -85,7 +85,7 @@ export const RedisInputForm = ({
creationStatement: "ACL SETUSER {{username}} on >{{password}} ~* &* +@all",
revocationStatement: "ACL DELUSER {{username}}"
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -96,33 +96,26 @@ export const RedisInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Redis, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Redis, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -333,19 +326,18 @@ export const RedisInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

50
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/SapAseInputForm.tsx
View File

@@ -51,7 +51,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -86,7 +86,7 @@ sp_role 'grant', 'mon_role', '{{username}}';`,
revocationStatement: `sp_dropuser '{{username}}';
sp_droplogin '{{username}}';`
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -97,33 +97,26 @@ sp_droplogin '{{username}}';`
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.SapAse, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.SapAse, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -311,19 +304,18 @@ sp_droplogin '{{username}}';`
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

50
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/SapHanaInputForm.tsx
View File

@@ -53,7 +53,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -86,7 +86,7 @@ GRANT "MONITORING" TO {{username}};`,
DROP USER {{username}};`,
renewStatement: "ALTER USER {{username}} VALID UNTIL '{{expiration}}';"
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -97,33 +97,26 @@ DROP USER {{username}};`,
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.SapHana, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret in environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.SapHana, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -331,19 +324,18 @@ DROP USER {{username}};`,
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

50
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/SnowflakeInputForm.tsx
View File

@@ -57,7 +57,7 @@ const formSchema = z.object({
.trim()
.min(1)
.refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -89,7 +89,7 @@ export const SnowflakeInputForm = ({
revocationStatement: "DROP USER {{username}};",
renewStatement: "ALTER USER {{username}} SET DAYS_TO_EXPIRY = {{expiration}};"
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -100,33 +100,26 @@ export const SnowflakeInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Snowflake, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch (err) {
createNotification({
type: "error",
text: err instanceof Error ? err.message : "Failed to create dynamic secret"
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Snowflake, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch (err) {
createNotification({
type: "error",
text: err instanceof Error ? err.message : "Failed to create dynamic secret"
});
}
};
@@ -334,19 +327,18 @@ export const SnowflakeInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

51
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/SqlDatabaseInputForm.tsx
View File

@@ -82,7 +82,7 @@ const formSchema = z.object({
ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TTL must be less than a day" });
}),
name: z.string().refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -176,7 +176,7 @@ export const SqlDatabaseInputForm = ({
allowedSymbols: "-_.~!*"
}
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : undefined
}
});
@@ -190,33 +190,27 @@ export const SqlDatabaseInputForm = ({
maxTTL,
provider,
defaultTTL,
environments: selectedEnvs
environment
}: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.SqlDatabase, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: env.slug
});
} catch {
createNotification({
type: "error",
text: `Failed to create dynamic secret for environment ${env.name}`
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.SqlDatabase, inputs: provider },
maxTTL,
name,
path: secretPath,
defaultTTL,
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch {
createNotification({
type: "error",
text: "Failed to create dynamic secret"
});
}
};
@@ -669,19 +663,18 @@ export const SqlDatabaseInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"

54
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/TotpInputForm.tsx
View File

@@ -61,7 +61,7 @@ const formSchema = z.object({
.trim()
.min(1)
.refine((val) => val.toLowerCase() === val, "Must be lowercase"),
environments: z.object({ name: z.string(), slug: z.string() }).array()
environment: z.object({ name: z.string(), slug: z.string() })
});
type TForm = z.infer<typeof formSchema>;
@@ -92,7 +92,7 @@ export const TotpInputForm = ({
provider: {
configType: ConfigType.URL
},
environments: environments.length === 1 ? environments : []
environment: environments.length === 1 ? environments[0] : environments[0]
}
});
@@ -100,36 +100,25 @@ export const TotpInputForm = ({
const createDynamicSecret = useCreateDynamicSecret();
const handleCreateDynamicSecret = async ({
name,
provider,
environments: selectedEnvs
}: TForm) => {
const handleCreateDynamicSecret = async ({ name, provider, environment }: TForm) => {
// wait till previous request is finished
if (createDynamicSecret.isPending) return;
let hasErrors = false;
const promises = selectedEnvs.map(async (env) => {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Totp, inputs: provider },
maxTTL: "24h",
name,
path: secretPath,
defaultTTL: "1m",
projectSlug,
environmentSlug: env.slug
});
} catch (err) {
createNotification({
type: "error",
text: err instanceof Error ? err.message : "Failed to create dynamic secret"
});
hasErrors = true;
}
});
await Promise.all(promises);
if (!hasErrors) {
try {
await createDynamicSecret.mutateAsync({
provider: { type: DynamicSecretProviders.Totp, inputs: provider },
maxTTL: "24h",
name,
path: secretPath,
defaultTTL: "1m",
projectSlug,
environmentSlug: environment.slug
});
onCompleted();
} catch (err) {
createNotification({
type: "error",
text: err instanceof Error ? err.message : "Failed to create dynamic secret"
});
}
};
@@ -319,19 +308,18 @@ export const TotpInputForm = ({
{environments.length > 1 && (
<Controller
control={control}
name="environments"
name="environment"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Environments"
label="Environment"
isError={Boolean(error)}
errorText={error?.message}
>
<FilterableSelect
isMulti
options={environments}
value={value}
onChange={onChange}
placeholder="Select environments to create secret in..."
placeholder="Select the environment to create secret in..."
getOptionLabel={(option) => option.name}
getOptionValue={(option) => option.slug}
menuPlacement="top"