diff --git a/cmd/ocsp-updater/main_test.go b/cmd/ocsp-updater/main_test.go index 862b69e77..e15752f78 100644 --- a/cmd/ocsp-updater/main_test.go +++ b/cmd/ocsp-updater/main_test.go @@ -17,7 +17,6 @@ import ( "github.com/letsencrypt/boulder/cmd" "github.com/letsencrypt/boulder/core" "github.com/letsencrypt/boulder/db" - "github.com/letsencrypt/boulder/features" blog "github.com/letsencrypt/boulder/log" "github.com/letsencrypt/boulder/metrics" "github.com/letsencrypt/boulder/sa" @@ -465,7 +464,6 @@ func TestIssuerInfo(t *testing.T) { m := mockOCSPRecordIssuer{} updater.ogc = &m reg := satest.CreateWorkingRegistration(t, sa) - _ = features.Set(map[string]bool{"StoreIssuerInfo": true}) k, err := rsa.GenerateKey(rand.Reader, 512) test.AssertNotError(t, err, "rsa.GenerateKey failed") diff --git a/features/featureflag_string.go b/features/featureflag_string.go index 64b7fd2c9..0a50de044 100644 --- a/features/featureflag_string.go +++ b/features/featureflag_string.go @@ -12,23 +12,23 @@ func _() { _ = x[PrecertificateRevocation-1] _ = x[StripDefaultSchemePort-2] _ = x[NonCFSSLSigner-3] - _ = x[CAAValidationMethods-4] - _ = x[CAAAccountURI-5] - _ = x[EnforceMultiVA-6] - _ = x[MultiVAFullResults-7] - _ = x[MandatoryPOSTAsGET-8] - _ = x[AllowV1Registration-9] - _ = x[V1DisableNewValidations-10] - _ = x[StoreIssuerInfo-11] + _ = x[StoreIssuerInfo-4] + _ = x[CAAValidationMethods-5] + _ = x[CAAAccountURI-6] + _ = x[EnforceMultiVA-7] + _ = x[MultiVAFullResults-8] + _ = x[MandatoryPOSTAsGET-9] + _ = x[AllowV1Registration-10] + _ = x[V1DisableNewValidations-11] _ = x[StoreRevokerInfo-12] _ = x[RestrictRSAKeySizes-13] _ = x[FasterNewOrdersRateLimit-14] _ = x[ECDSAForAll-15] } -const _FeatureFlag_name = "unusedPrecertificateRevocationStripDefaultSchemePortNonCFSSLSignerCAAValidationMethodsCAAAccountURIEnforceMultiVAMultiVAFullResultsMandatoryPOSTAsGETAllowV1RegistrationV1DisableNewValidationsStoreIssuerInfoStoreRevokerInfoRestrictRSAKeySizesFasterNewOrdersRateLimitECDSAForAll" +const _FeatureFlag_name = "unusedPrecertificateRevocationStripDefaultSchemePortNonCFSSLSignerStoreIssuerInfoCAAValidationMethodsCAAAccountURIEnforceMultiVAMultiVAFullResultsMandatoryPOSTAsGETAllowV1RegistrationV1DisableNewValidationsStoreRevokerInfoRestrictRSAKeySizesFasterNewOrdersRateLimitECDSAForAll" -var _FeatureFlag_index = [...]uint16{0, 6, 30, 52, 66, 86, 99, 113, 131, 149, 168, 191, 206, 222, 241, 265, 276} +var _FeatureFlag_index = [...]uint16{0, 6, 30, 52, 66, 81, 101, 114, 128, 146, 164, 183, 206, 222, 241, 265, 276} 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 cca35d3ba..835a88033 100644 --- a/features/features.go +++ b/features/features.go @@ -15,6 +15,7 @@ const ( PrecertificateRevocation StripDefaultSchemePort NonCFSSLSigner + StoreIssuerInfo // Currently in-use features // Check CAA and respect validationmethods parameter. @@ -35,9 +36,6 @@ const ( // V1DisableNewValidations disables validations for new domain names in the V1 // API. V1DisableNewValidations - // StoreIssuerInfo enables storage of information identifying the issuer of - // a certificate in the certificateStatus table. - StoreIssuerInfo // StoreRevokerInfo enables storage of the revoker and a bool indicating if the row // was checked for extant unrevoked certificates in the blockedKeys table. StoreRevokerInfo diff --git a/test/config-next/ca-a.json b/test/config-next/ca-a.json index 6c21affb9..1289d00a5 100644 --- a/test/config-next/ca-a.json +++ b/test/config-next/ca-a.json @@ -90,8 +90,7 @@ "ocspLogMaxLength": 4000, "ocspLogPeriod": "500ms", "features": { - "NonCFSSLSigner": true, - "StoreIssuerInfo": true + "NonCFSSLSigner": true } }, diff --git a/test/config-next/ca-b.json b/test/config-next/ca-b.json index 2f2e900a9..6573f7074 100644 --- a/test/config-next/ca-b.json +++ b/test/config-next/ca-b.json @@ -90,8 +90,7 @@ "ocspLogMaxLength": 4000, "ocspLogPeriod": "500ms", "features": { - "NonCFSSLSigner": true, - "StoreIssuerInfo": true + "NonCFSSLSigner": true } }, diff --git a/test/config-next/ocsp-updater.json b/test/config-next/ocsp-updater.json index 3dbc4f9eb..cec192e70 100644 --- a/test/config-next/ocsp-updater.json +++ b/test/config-next/ocsp-updater.json @@ -20,9 +20,7 @@ "serverAddress": "ca.boulder:9096", "timeout": "15s" }, - "features": { - "StoreIssuerInfo": true - } + "features": {} }, "syslog": { diff --git a/test/config-next/sa.json b/test/config-next/sa.json index a50f03d0e..8bec4a3b5 100644 --- a/test/config-next/sa.json +++ b/test/config-next/sa.json @@ -26,9 +26,8 @@ ] }, "features": { - "StoreIssuerInfo": true, - "StoreRevokerInfo": true, - "FasterNewOrdersRateLimit": true + "FasterNewOrdersRateLimit": true, + "StoreRevokerInfo": true } }, diff --git a/test/config/ca-a.json b/test/config/ca-a.json index d0e3a5229..e7ad326ae 100644 --- a/test/config/ca-a.json +++ b/test/config/ca-a.json @@ -86,8 +86,7 @@ "blockedKeyFile": "test/example-blocked-keys.yaml", "orphanQueueDir": "/tmp/orphaned-certificates-a", "features": { - "NonCFSSLSigner": true, - "StoreIssuerInfo": true + "NonCFSSLSigner": true } }, diff --git a/test/config/ca-b.json b/test/config/ca-b.json index 55043402d..ad09bffff 100644 --- a/test/config/ca-b.json +++ b/test/config/ca-b.json @@ -86,8 +86,7 @@ "blockedKeyFile": "test/example-blocked-keys.yaml", "orphanQueueDir": "/tmp/orphaned-certificates-b", "features": { - "NonCFSSLSigner": true, - "StoreIssuerInfo": true + "NonCFSSLSigner": true } }, diff --git a/test/config/ocsp-updater.json b/test/config/ocsp-updater.json index 3dbc4f9eb..cec192e70 100644 --- a/test/config/ocsp-updater.json +++ b/test/config/ocsp-updater.json @@ -20,9 +20,7 @@ "serverAddress": "ca.boulder:9096", "timeout": "15s" }, - "features": { - "StoreIssuerInfo": true - } + "features": {} }, "syslog": { diff --git a/test/config/sa.json b/test/config/sa.json index 035de2b83..572b45c7f 100644 --- a/test/config/sa.json +++ b/test/config/sa.json @@ -27,7 +27,6 @@ }, "features": { "FasterNewOrdersRateLimit": true, - "StoreIssuerInfo": true, "StoreRevokerInfo": true } },