From 9e651a58e3de0fa0bf8c6feef74f0c4943490719 Mon Sep 17 00:00:00 2001 From: x032205 Date: Tue, 3 Jun 2025 18:09:45 -0400 Subject: [PATCH 1/2] fix margin and make text click-through --- .../src/ee/services/license/license-fns.ts | 52 +++++++++---------- .../SpecificPrivilegeSection.tsx | 16 +++--- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/backend/src/ee/services/license/license-fns.ts b/backend/src/ee/services/license/license-fns.ts index 231a35d0d..d6c42a9b1 100644 --- a/backend/src/ee/services/license/license-fns.ts +++ b/backend/src/ee/services/license/license-fns.ts @@ -18,33 +18,33 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({ environmentsUsed: 0, identityLimit: null, identitiesUsed: 0, - dynamicSecret: false, + dynamicSecret: true, secretVersioning: true, - pitRecovery: false, - ipAllowlisting: false, - rbac: false, - githubOrgSync: false, + pitRecovery: true, + ipAllowlisting: true, + rbac: true, + githubOrgSync: true, customRateLimits: false, - customAlerts: false, - secretAccessInsights: false, - auditLogs: false, - auditLogsRetentionDays: 0, - auditLogStreams: false, + customAlerts: true, + secretAccessInsights: true, + auditLogs: true, + auditLogsRetentionDays: 3, + auditLogStreams: true, auditLogStreamLimit: 3, - samlSSO: false, - hsm: false, - oidcSSO: false, - scim: false, - ldap: false, - groups: false, + samlSSO: true, + hsm: true, + oidcSSO: true, + scim: true, + ldap: true, + groups: true, status: null, trial_end: null, has_used_trial: true, - secretApproval: false, - secretRotation: false, - caCrl: false, - instanceUserManagement: false, - externalKms: false, + secretApproval: true, + secretRotation: true, + caCrl: true, + instanceUserManagement: true, + externalKms: true, rateLimits: { readLimit: 60, writeLimit: 200, @@ -52,12 +52,10 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({ }, pkiEst: false, enforceMfa: false, - projectTemplates: false, - kmip: false, - gateway: false, - sshHostGroups: false, - enterpriseSecretSyncs: false, - enterpriseAppConnections: false + projectTemplates: true, + kmip: true, + gateway: true, + sshHostGroups: true }); export const setupLicenseRequestWithStore = ( diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/SpecificPrivilegeSection.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/SpecificPrivilegeSection.tsx index e8d2ef77f..35494419c 100644 --- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/SpecificPrivilegeSection.tsx +++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/SpecificPrivilegeSection.tsx @@ -351,7 +351,7 @@ export const SpecificPrivilegeSecretForm = ({ isChecked={field.value} onCheckedChange={(isChecked) => field.onChange(isChecked)} /> -
+

Read secret values

@@ -382,7 +382,7 @@ export const SpecificPrivilegeSecretForm = ({ isChecked={field.value} onCheckedChange={(isChecked) => field.onChange(isChecked)} /> -
+

Create new secrets

@@ -415,7 +415,7 @@ export const SpecificPrivilegeSecretForm = ({ isChecked={field.value} onCheckedChange={(isChecked) => field.onChange(isChecked)} /> -
+

Update existing secrets

@@ -446,7 +446,7 @@ export const SpecificPrivilegeSecretForm = ({ isChecked={field.value} onCheckedChange={(isChecked) => field.onChange(isChecked)} /> -
+

Delete existing secrets

From fef7e43869173683861cfccdf042e8c2bfc6eeeb Mon Sep 17 00:00:00 2001 From: x032205 Date: Tue, 3 Jun 2025 18:10:20 -0400 Subject: [PATCH 2/2] revert license --- .../src/ee/services/license/license-fns.ts | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/backend/src/ee/services/license/license-fns.ts b/backend/src/ee/services/license/license-fns.ts index d6c42a9b1..231a35d0d 100644 --- a/backend/src/ee/services/license/license-fns.ts +++ b/backend/src/ee/services/license/license-fns.ts @@ -18,33 +18,33 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({ environmentsUsed: 0, identityLimit: null, identitiesUsed: 0, - dynamicSecret: true, + dynamicSecret: false, secretVersioning: true, - pitRecovery: true, - ipAllowlisting: true, - rbac: true, - githubOrgSync: true, + pitRecovery: false, + ipAllowlisting: false, + rbac: false, + githubOrgSync: false, customRateLimits: false, - customAlerts: true, - secretAccessInsights: true, - auditLogs: true, - auditLogsRetentionDays: 3, - auditLogStreams: true, + customAlerts: false, + secretAccessInsights: false, + auditLogs: false, + auditLogsRetentionDays: 0, + auditLogStreams: false, auditLogStreamLimit: 3, - samlSSO: true, - hsm: true, - oidcSSO: true, - scim: true, - ldap: true, - groups: true, + samlSSO: false, + hsm: false, + oidcSSO: false, + scim: false, + ldap: false, + groups: false, status: null, trial_end: null, has_used_trial: true, - secretApproval: true, - secretRotation: true, - caCrl: true, - instanceUserManagement: true, - externalKms: true, + secretApproval: false, + secretRotation: false, + caCrl: false, + instanceUserManagement: false, + externalKms: false, rateLimits: { readLimit: 60, writeLimit: 200, @@ -52,10 +52,12 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({ }, pkiEst: false, enforceMfa: false, - projectTemplates: true, - kmip: true, - gateway: true, - sshHostGroups: true + projectTemplates: false, + kmip: false, + gateway: false, + sshHostGroups: false, + enterpriseSecretSyncs: false, + enterpriseAppConnections: false }); export const setupLicenseRequestWithStore = (