diff --git a/features/featureflag_string.go b/features/featureflag_string.go index 0210bab5b..d7e1576ae 100644 --- a/features/featureflag_string.go +++ b/features/featureflag_string.go @@ -4,9 +4,9 @@ package features import "strconv" -const _FeatureFlag_name = "unusedReusePendingAuthzCancelCTSubmissionsCountCertificatesExactIPv6FirstEnforceChallengeDisableEmbedSCTsWildcardDomainsForceConsistentStatusRPCHeadroomVAChecksGSBEnforceV2ContentTypeEnforceOverlappingWildcardsOrderReadyStatusPerformValidationRPCACME13KeyRolloverAllowRenewalFirstRLTLSSNIRevalidationCAAValidationMethodsCAAAccountURIProbeCTLogsSimplifiedVAHTTPHeadNonceStatusOK" +const _FeatureFlag_name = "unusedPerformValidationRPCACME13KeyRolloverAllowRenewalFirstRLTLSSNIRevalidationCAAValidationMethodsCAAAccountURIProbeCTLogsSimplifiedVAHTTPHeadNonceStatusOK" -var _FeatureFlag_index = [...]uint16{0, 6, 23, 42, 64, 73, 96, 105, 120, 141, 152, 163, 183, 210, 226, 246, 263, 282, 300, 320, 333, 344, 360, 377} +var _FeatureFlag_index = [...]uint8{0, 6, 26, 43, 62, 80, 100, 113, 124, 140, 157} func (i FeatureFlag) String() string { if i < 0 || i >= FeatureFlag(len(_FeatureFlag_index)-1) { diff --git a/features/features.go b/features/features.go index b931344d4..f79358bab 100644 --- a/features/features.go +++ b/features/features.go @@ -12,19 +12,6 @@ type FeatureFlag int const ( unused FeatureFlag = iota // unused is used for testing // Deprecated features, these can be removed once stripped from production configs - ReusePendingAuthz - CancelCTSubmissions - CountCertificatesExact - IPv6First - EnforceChallengeDisable - EmbedSCTs - WildcardDomains - ForceConsistentStatus - RPCHeadroom - VAChecksGSB - EnforceV2ContentType - EnforceOverlappingWildcards - OrderReadyStatus PerformValidationRPC ACME13KeyRollover @@ -48,29 +35,16 @@ const ( // List of features and their default value, protected by fMu var features = map[FeatureFlag]bool{ - unused: false, - ReusePendingAuthz: false, - CountCertificatesExact: false, - IPv6First: false, - AllowRenewalFirstRL: false, - WildcardDomains: false, - EnforceChallengeDisable: false, - RPCHeadroom: false, - TLSSNIRevalidation: false, - EmbedSCTs: false, - CancelCTSubmissions: true, - VAChecksGSB: false, - EnforceV2ContentType: false, - ForceConsistentStatus: false, - EnforceOverlappingWildcards: false, - OrderReadyStatus: false, - CAAValidationMethods: false, - CAAAccountURI: false, - ACME13KeyRollover: false, - ProbeCTLogs: false, - SimplifiedVAHTTP: false, - PerformValidationRPC: false, - HeadNonceStatusOK: false, + unused: false, + AllowRenewalFirstRL: false, + TLSSNIRevalidation: false, + CAAValidationMethods: false, + CAAAccountURI: false, + ACME13KeyRollover: false, + ProbeCTLogs: false, + SimplifiedVAHTTP: false, + PerformValidationRPC: false, + HeadNonceStatusOK: false, } var fMu = new(sync.RWMutex) diff --git a/test/config-next/ca-a.json b/test/config-next/ca-a.json index 8ce159902..dcf405b29 100644 --- a/test/config-next/ca-a.json +++ b/test/config-next/ca-a.json @@ -129,8 +129,6 @@ "maxConcurrentRPCServerRequests": 100000, "orphanQueueDir": "/tmp/orphaned-certificates-a", "features": { - "RPCHeadroom": true, - "WildcardDomains": true } }, diff --git a/test/config-next/ca-b.json b/test/config-next/ca-b.json index 1aa5c2b94..2817e7ca2 100644 --- a/test/config-next/ca-b.json +++ b/test/config-next/ca-b.json @@ -129,8 +129,6 @@ "maxConcurrentRPCServerRequests": 100000, "orphanQueueDir": "/tmp/orphaned-certificates-b", "features": { - "RPCHeadroom": true, - "WildcardDomains": true } }, diff --git a/test/config-next/ocsp-updater.json b/test/config-next/ocsp-updater.json index f873e4bc3..ea9c183a8 100644 --- a/test/config-next/ocsp-updater.json +++ b/test/config-next/ocsp-updater.json @@ -36,7 +36,6 @@ "timeout": "15s" }, "features": { - "RPCHeadroom": true } }, diff --git a/test/config-next/publisher.json b/test/config-next/publisher.json index 31955a52b..c3bec7ccc 100644 --- a/test/config-next/publisher.json +++ b/test/config-next/publisher.json @@ -18,7 +18,6 @@ "keyFile": "test/grpc-creds/publisher.boulder/key.pem" }, "features": { - "RPCHeadroom": true, "ProbeCTLogs": true } }, diff --git a/test/config-next/ra.json b/test/config-next/ra.json index d5a27ebcf..a00922b3b 100644 --- a/test/config-next/ra.json +++ b/test/config-next/ra.json @@ -41,12 +41,7 @@ ] }, "features": { - "RPCHeadroom": true, - "WildcardDomains": true, - "TLSSNIRevalidation": true, - "ReusePendingAuthz": true, - "EnforceOverlappingWildcards": true, - "VAChecksGSB": true + "TLSSNIRevalidation": true }, "CTLogGroups2": [ { diff --git a/test/config-next/sa.json b/test/config-next/sa.json index e4f2df901..46a80408f 100644 --- a/test/config-next/sa.json +++ b/test/config-next/sa.json @@ -26,10 +26,7 @@ ] }, "features": { - "RPCHeadroom": true, - "WildcardDomains": true, - "AllowRenewalFirstRL": true, - "OrderReadyStatus": true + "AllowRenewalFirstRL": true } }, diff --git a/test/config-next/va-remote-a.json b/test/config-next/va-remote-a.json index 9cf70c226..5c8ddbfaf 100644 --- a/test/config-next/va-remote-a.json +++ b/test/config-next/va-remote-a.json @@ -27,8 +27,6 @@ ] }, "features": { - "RPCHeadroom": true, - "IPv6First": true, "CAAValidationMethods": true, "CAAAccountURI": true, "SimplifiedVAHTTP": true diff --git a/test/config-next/va-remote-b.json b/test/config-next/va-remote-b.json index ed2ce338a..b56ac9e4f 100644 --- a/test/config-next/va-remote-b.json +++ b/test/config-next/va-remote-b.json @@ -27,8 +27,6 @@ ] }, "features": { - "RPCHeadroom": true, - "IPv6First": true, "CAAValidationMethods": true, "CAAAccountURI": true, "SimplifiedVAHTTP": true diff --git a/test/config-next/va.json b/test/config-next/va.json index 400d02f06..3a25fd6b2 100644 --- a/test/config-next/va.json +++ b/test/config-next/va.json @@ -32,9 +32,6 @@ "ServerURL": "http://va1.boulder:6000" }, "features": { - "RPCHeadroom": true, - "VAChecksGSB": true, - "IPv6First": true, "CAAValidationMethods": true, "CAAAccountURI": true, "SimplifiedVAHTTP": true diff --git a/test/config-next/wfe.json b/test/config-next/wfe.json index e83fd6cfe..52103491c 100644 --- a/test/config-next/wfe.json +++ b/test/config-next/wfe.json @@ -31,7 +31,6 @@ "timeout": "15s" }, "features": { - "RPCHeadroom": true } }, diff --git a/test/config-next/wfe2.json b/test/config-next/wfe2.json index 6f14806e2..d30fbfe33 100644 --- a/test/config-next/wfe2.json +++ b/test/config-next/wfe2.json @@ -36,9 +36,6 @@ "http://127.0.0.1:4000/acme/issuer-cert": [ "test/test-ca2.pem" ] }, "features": { - "EnforceV2ContentType": true, - "RPCHeadroom": true, - "HeadNonceStatusOK": true } }, diff --git a/test/config/ca-a.json b/test/config/ca-a.json index 82f424b91..af3843883 100644 --- a/test/config/ca-a.json +++ b/test/config/ca-a.json @@ -131,8 +131,6 @@ }, "maxConcurrentRPCServerRequests": 100000, "features": { - "RPCHeadroom": true, - "WildcardDomains": true } }, diff --git a/test/config/ca-b.json b/test/config/ca-b.json index 82f424b91..af3843883 100644 --- a/test/config/ca-b.json +++ b/test/config/ca-b.json @@ -131,8 +131,6 @@ }, "maxConcurrentRPCServerRequests": 100000, "features": { - "RPCHeadroom": true, - "WildcardDomains": true } }, diff --git a/test/config/ocsp-updater.json b/test/config/ocsp-updater.json index 97f1137cb..bdd3fe35f 100644 --- a/test/config/ocsp-updater.json +++ b/test/config/ocsp-updater.json @@ -36,7 +36,6 @@ "timeout": "15s" }, "features": { - "RPCHeadroom": true } }, diff --git a/test/config/publisher.json b/test/config/publisher.json index c3fb74f9b..480079c48 100644 --- a/test/config/publisher.json +++ b/test/config/publisher.json @@ -17,7 +17,6 @@ "keyFile": "test/grpc-creds/publisher.boulder/key.pem" }, "features": { - "RPCHeadroom": true } }, diff --git a/test/config/ra.json b/test/config/ra.json index da4a2a2a3..302e9d208 100644 --- a/test/config/ra.json +++ b/test/config/ra.json @@ -46,12 +46,7 @@ ] }, "features": { - "RPCHeadroom": true, - "WildcardDomains": true, - "TLSSNIRevalidation": true, - "ReusePendingAuthz": true, - "EnforceOverlappingWildcards": true, - "VAChecksGSB": true + "TLSSNIRevalidation": true }, "CTLogGroups2": [ { diff --git a/test/config/sa.json b/test/config/sa.json index 726b7a5e1..7abf258f0 100644 --- a/test/config/sa.json +++ b/test/config/sa.json @@ -25,8 +25,6 @@ ] }, "features": { - "RPCHeadroom": true, - "WildcardDomains": true } }, diff --git a/test/config/va.json b/test/config/va.json index 579225fb2..f8fd968b3 100644 --- a/test/config/va.json +++ b/test/config/va.json @@ -32,9 +32,6 @@ "ServerURL": "http://va1.boulder:6000" }, "features": { - "RPCHeadroom": true, - "VAChecksGSB": true, - "IPv6First": true } }, diff --git a/test/config/wfe.json b/test/config/wfe.json index 6502d39d9..a39cbd879 100644 --- a/test/config/wfe.json +++ b/test/config/wfe.json @@ -31,7 +31,6 @@ "timeout": "15s" }, "features": { - "RPCHeadroom": true } }, diff --git a/test/config/wfe2.json b/test/config/wfe2.json index afa1457a8..4063e5953 100644 --- a/test/config/wfe2.json +++ b/test/config/wfe2.json @@ -35,8 +35,6 @@ "http://127.0.0.1:4000/acme/issuer-cert": [ "test/test-ca2.pem" ] }, "features": { - "EnforceV2ContentType": true, - "RPCHeadroom": true } },