mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-09-22 13:39:35 +00:00
Comment changes + revert license
This commit is contained in:
@@ -6,7 +6,6 @@ import { logger } from "@app/lib/logger";
|
|||||||
|
|
||||||
import { TFeatureSet } from "./license-types";
|
import { TFeatureSet } from "./license-types";
|
||||||
|
|
||||||
// TODO(andrey): Revert this
|
|
||||||
export const getDefaultOnPremFeatures = (): TFeatureSet => ({
|
export const getDefaultOnPremFeatures = (): TFeatureSet => ({
|
||||||
_id: null,
|
_id: null,
|
||||||
slug: null,
|
slug: null,
|
||||||
@@ -19,33 +18,33 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
|
|||||||
environmentsUsed: 0,
|
environmentsUsed: 0,
|
||||||
identityLimit: null,
|
identityLimit: null,
|
||||||
identitiesUsed: 0,
|
identitiesUsed: 0,
|
||||||
dynamicSecret: true,
|
dynamicSecret: false,
|
||||||
secretVersioning: true,
|
secretVersioning: true,
|
||||||
pitRecovery: true,
|
pitRecovery: false,
|
||||||
ipAllowlisting: true,
|
ipAllowlisting: false,
|
||||||
rbac: true,
|
rbac: false,
|
||||||
githubOrgSync: true,
|
githubOrgSync: false,
|
||||||
customRateLimits: false,
|
customRateLimits: false,
|
||||||
customAlerts: true,
|
customAlerts: false,
|
||||||
secretAccessInsights: true,
|
secretAccessInsights: false,
|
||||||
auditLogs: true,
|
auditLogs: false,
|
||||||
auditLogsRetentionDays: 3,
|
auditLogsRetentionDays: 0,
|
||||||
auditLogStreams: true,
|
auditLogStreams: false,
|
||||||
auditLogStreamLimit: 3,
|
auditLogStreamLimit: 3,
|
||||||
samlSSO: true,
|
samlSSO: false,
|
||||||
hsm: true,
|
hsm: false,
|
||||||
oidcSSO: true,
|
oidcSSO: false,
|
||||||
scim: true,
|
scim: false,
|
||||||
ldap: true,
|
ldap: false,
|
||||||
groups: true,
|
groups: false,
|
||||||
status: null,
|
status: null,
|
||||||
trial_end: null,
|
trial_end: null,
|
||||||
has_used_trial: true,
|
has_used_trial: true,
|
||||||
secretApproval: true,
|
secretApproval: false,
|
||||||
secretRotation: true,
|
secretRotation: false,
|
||||||
caCrl: true,
|
caCrl: false,
|
||||||
instanceUserManagement: true,
|
instanceUserManagement: false,
|
||||||
externalKms: true,
|
externalKms: false,
|
||||||
rateLimits: {
|
rateLimits: {
|
||||||
readLimit: 60,
|
readLimit: 60,
|
||||||
writeLimit: 200,
|
writeLimit: 200,
|
||||||
@@ -53,13 +52,13 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
|
|||||||
},
|
},
|
||||||
pkiEst: false,
|
pkiEst: false,
|
||||||
enforceMfa: false,
|
enforceMfa: false,
|
||||||
projectTemplates: true,
|
projectTemplates: false,
|
||||||
kmip: true,
|
kmip: false,
|
||||||
gateway: true,
|
gateway: false,
|
||||||
sshHostGroups: true,
|
sshHostGroups: false,
|
||||||
enterpriseAppConnections: true,
|
secretScanning: false,
|
||||||
enterpriseSecretSyncs: true,
|
enterpriseSecretSyncs: false,
|
||||||
secretScanning: true
|
enterpriseAppConnections: false
|
||||||
});
|
});
|
||||||
|
|
||||||
export const setupLicenseRequestWithStore = (
|
export const setupLicenseRequestWithStore = (
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ export const registerSecretScanningV2Webhooks = async (server: FastifyZodProvide
|
|||||||
rateLimit: writeLimit
|
rateLimit: writeLimit
|
||||||
},
|
},
|
||||||
handler: async (req, res) => {
|
handler: async (req, res) => {
|
||||||
// TODO(andrey): Verify IP is from bitbucket
|
// TODO(andrey): Verify request is from bitbucket
|
||||||
|
|
||||||
const { dataSourceId } = req.query;
|
const { dataSourceId } = req.query;
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ export const BitbucketDataSourceConfigFields = () => {
|
|||||||
|
|
||||||
const { data: repositories, isPending: areRepositoriesLoading } =
|
const { data: repositories, isPending: areRepositoriesLoading } =
|
||||||
useBitbucketConnectionListRepositories(connectionId, selectedWorkspaceSlug, {
|
useBitbucketConnectionListRepositories(connectionId, selectedWorkspaceSlug, {
|
||||||
enabled: Boolean(connectionId) && Boolean(selectedWorkspaceSlug) // Enable only if both are present
|
enabled: Boolean(connectionId) && Boolean(selectedWorkspaceSlug)
|
||||||
});
|
});
|
||||||
|
|
||||||
const includeRepos = watch("config.includeRepos");
|
const includeRepos = watch("config.includeRepos");
|
||||||
@@ -127,7 +127,6 @@ export const BitbucketDataSourceConfigFields = () => {
|
|||||||
{scanMethod === ScanMethod.SelectRepositories && (
|
{scanMethod === ScanMethod.SelectRepositories && (
|
||||||
<Controller
|
<Controller
|
||||||
name="config.includeRepos"
|
name="config.includeRepos"
|
||||||
// defaultValue={["*"]} // This defaultValue is handled by the useEffect above
|
|
||||||
control={control}
|
control={control}
|
||||||
render={({ field: { value, onChange }, fieldState: { error } }) => (
|
render={({ field: { value, onChange }, fieldState: { error } }) => (
|
||||||
<FormControl
|
<FormControl
|
||||||
@@ -149,16 +148,14 @@ export const BitbucketDataSourceConfigFields = () => {
|
|||||||
<FilterableSelect
|
<FilterableSelect
|
||||||
menuPlacement="top"
|
menuPlacement="top"
|
||||||
isLoading={areRepositoriesLoading && Boolean(connectionId)}
|
isLoading={areRepositoriesLoading && Boolean(connectionId)}
|
||||||
// Disable if no connection or no workspace slug is selected for fetching repositories
|
|
||||||
isDisabled={!connectionId || !selectedWorkspaceSlug}
|
isDisabled={!connectionId || !selectedWorkspaceSlug}
|
||||||
isMulti
|
isMulti
|
||||||
// Ensure 'value' is treated as a string array for filtering
|
|
||||||
value={repositories?.filter((repository) =>
|
value={repositories?.filter((repository) =>
|
||||||
(value as string[]).includes(repository.full_name)
|
(value as string[]).includes(repository.full_name)
|
||||||
)}
|
)}
|
||||||
onChange={(newValue) => {
|
onChange={(newValue) => {
|
||||||
onChange(
|
onChange(
|
||||||
newValue ? (newValue as MultiValue<TBitbucketRepo>).map((p) => p.full_name) : [] // Ensure it's an empty array if cleared
|
newValue ? (newValue as MultiValue<TBitbucketRepo>).map((p) => p.full_name) : []
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
options={repositories}
|
options={repositories}
|
||||||
|
|||||||
Reference in New Issue
Block a user