Merge pull request #33074 from vespa-engine/bjorncs/cleanup-feature-f…

…lags Bjorncs/cleanup feature flags
vespa-engine · Jan 3, 2025 · 4cba63c · 4cba63c
2 parents 6e65e29 + 4a57b3c
commit 4cba63c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 39 deletions.
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -245,14 +245,6 @@ public class Flags {
             "Takes effect immediately",
             INSTANCE_ID);
 
-    public static final UnboundStringFlag TLS_CAPABILITIES_ENFORCEMENT_MODE = defineStringFlag(
-            "tls-capabilities-enforcement-mode", "disable",
-            List.of("bjorncs", "vekterli"), "2022-07-21", "2025-06-01",
-            "Configure Vespa TLS capability enforcement mode",
-            "Takes effect on restart of Docker container",
-            INSTANCE_ID,HOSTNAME,NODE_TYPE,TENANT_ID,VESPA_VERSION
-    );
-
     public static final UnboundBooleanFlag ENABLE_OTELCOL = defineFeatureFlag(
             "enable-otel-collector", false,
             List.of("olaa"), "2022-09-23", "2025-02-01",
@@ -355,12 +347,6 @@ public class Flags {
             "Takes effect on next deployment through controller",
             TENANT_ID, APPLICATION, INSTANCE_ID);
 
-    public static final UnboundBooleanFlag CLOUD_TRIAL_NOTIFICATIONS = defineFeatureFlag(
-            "cloud-trial-notifications", false,
-            List.of("bjorncs", "oyving"), "2023-10-13", "2025-02-01",
-            "Whether to send cloud trial email notifications",
-            "Takes effect immediately");
-
     public static final UnboundIntFlag PERSISTENCE_THREAD_MAX_FEED_OP_BATCH_SIZE = defineIntFlag(
             "persistence-thread-max-feed-op-batch-size", 64,
             List.of("vekterli"), "2024-04-12", "2025-03-01",
@@ -376,12 +362,6 @@ public class Flags {
             "Whether logserver container should run otel agent",
             "Takes effect at redeployment", INSTANCE_ID);
 
-    public static UnboundBooleanFlag HUBSPOT_SYNC_TENANTS = defineFeatureFlag(
-            "hubspot-sync-tenants", false,
-            List.of("bjorncs"), "2024-05-07", "2025-02-01",
-            "Whether to sync tenants to HubSpot",
-            "Takes effect immediately");
-
     public static UnboundBooleanFlag ATLASSIAN_SYNC_TENANTS = defineFeatureFlag(
             "atlassian-sync-tenants", false,
             List.of("bjormel"), "2024-11-11", "2025-02-01",
@@ -397,13 +377,6 @@ public class Flags {
             "Takes effect immediately",
             INSTANCE_ID);
 
-    public static final UnboundBooleanFlag ENABLE_NEW_TRIAL = defineFeatureFlag(
-            "enable-new-trial", false,
-            List.of("bjorncs"), "2024-06-18", "2025-02-01",
-            "Whether to enable the new trial experience",
-            "Takes effect immediately",
-            TENANT_ID);
-
     public static final UnboundBooleanFlag ENFORCE_STRICTLY_INCREASING_CLUSTER_STATE_VERSIONS = defineFeatureFlag(
             "enforce-strictly-increasing-cluster-state-versions", true,
             List.of("vekterli"), "2024-06-03", "2025-03-01",
@@ -419,12 +392,6 @@ public class Flags {
             "Takes effect on next deployment",
             INSTANCE_ID);
 
-    public static final UnboundBooleanFlag HUBSPOT_SYNC_CONTACTS = defineFeatureFlag(
-            "hubspot-sync-contacts", false,
-            List.of("bjorncs"), "2024-05-27", "2025-02-01",
-            "Whether to sync contacts to HubSpot",
-            "Takes effect immediately");
-
     public static final UnboundBooleanFlag DISTRIBUTION_CONFIG_FROM_CLUSTER_CONTROLLER = defineFeatureFlag(
             "distribution-config-from-cluster-controller", true,
             List.of("vekterli"), "2024-07-01", "2025-03-01",
@@ -448,12 +415,6 @@ public class Flags {
             "Takes effect immediately",
             TENANT_ID, CONSOLE_USER_EMAIL);
 
-    public static final UnboundBooleanFlag HUBSPOT_SYNC_COMPANIES = defineFeatureFlag(
-            "hubspot-sync-companies", false,
-            List.of("bjorncs"), "2024-07-19", "2025-02-01",
-            "Whether to sync companies to HubSpot",
-            "Takes effect immediately");
-
     public static final UnboundBooleanFlag SNAPSHOTS_ENABLED = defineFeatureFlag(
             "snapshots-enabled", false,
             List.of("mpolden"), "2024-10-22", "2025-01-10",

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
@@ -539,6 +539,29 @@ public class PermanentFlags {
             "Allowed Athenz proxy identities",
             "takes effect at redeployment");
 
+    public static final UnboundBooleanFlag HUBSPOT_SYNC_TENANTS = defineFeatureFlag(
+            "hubspot-sync-tenants", true,
+            "Whether to sync tenants to HubSpot. Use this to block sync for specific tenants",
+            "Takes effect immediately");
+
+    public static final UnboundBooleanFlag HUBSPOT_SYNC_CONTACTS = defineFeatureFlag(
+            "hubspot-sync-contacts", true,
+            "Whether to sync contacts to HubSpot. Use this to block sync for specific users",
+            "Takes effect immediately");
+
+    public static final UnboundBooleanFlag HUBSPOT_SYNC_COMPANIES = defineFeatureFlag(
+            "hubspot-sync-companies", true,
+            "Whether to sync companies to HubSpot. Use this to block sync for specific companies",
+            "Takes effect immediately");
+
+    public static final UnboundStringFlag TLS_CAPABILITIES_ENFORCEMENT_MODE = defineStringFlag(
+            "tls-capabilities-enforcement-mode", "disable",
+            "Configure Vespa TLS capability enforcement mode",
+            "Takes effect on restart of Docker container",
+            INSTANCE_ID,HOSTNAME,NODE_TYPE,TENANT_ID,VESPA_VERSION
+    );
+
+
     private PermanentFlags() {}
 
     private static UnboundBooleanFlag defineFeatureFlag(