chore: cleanup remaining artifacts remaining related to aci signing (P…

…ROJQUAY-2792) (#968)

Removes deprecated artifacts from code and files for ACI.

config.py

@@ -345,9 +345,6 @@ def create_transaction(db):
     # Feature Flag: Whether or not to rotate old action logs to storage.
     FEATURE_ACTION_LOG_ROTATION = False
 
-    # Feature Flag: Whether to enable conversion to ACIs.
-    FEATURE_ACI_CONVERSION = False
-
     # Feature Flag: Whether to allow for "namespace-less" repositories when pulling and pushing from
     # Docker.
     FEATURE_LIBRARY_SUPPORT = True

endpoints/common.py

@@ -148,7 +148,6 @@ def get_oauth_config():
         google_anaytics_key=app.config.get("GOOGLE_ANALYTICS_KEY", ""),
         sentry_public_dsn=app.config.get("SENTRY_PUBLIC_DSN", ""),
         is_debug=str(app.config.get("DEBUGGING", False)).lower(),
-        aci_conversion=features.ACI_CONVERSION,
         has_billing=features.BILLING,
         onprem=not app.config.get("FEATURE_BILLING", False),
         contact_href=contact_href,

local-dev/config.yaml

@@ -17,7 +17,6 @@ DISTRIBUTED_STORAGE_PREFERENCE:
 - default
 ENTERPRISE_LOGO_URL: /static/img/quay-horizontal-color.svg
 EXTERNAL_TLS_TERMINATION: true
-FEATURE_ACI_CONVERSION: false
 FEATURE_ANONYMOUS_ACCESS: true
 FEATURE_APP_REGISTRY: false
 FEATURE_APP_SPECIFIC_TOKENS: true
@@ -37,8 +36,6 @@ FEATURE_USER_LOG_ACCESS: true
 GITHUB_LOGIN_CONFIG: {}
 GITHUB_TRIGGER_CONFIG: {}
 GITLAB_TRIGGER_KIND: {}
-GPG2_PRIVATE_KEY_FILENAME: signing-private.gpg
-GPG2_PUBLIC_KEY_FILENAME: signing-public.gpg
 LOG_ARCHIVE_LOCATION: default
 MAIL_DEFAULT_SENDER: admin@example.com
 MAIL_PORT: 587
@@ -50,7 +47,6 @@ REPO_MIRROR_SERVER_HOSTNAME: null
 REPO_MIRROR_TLS_VERIFY: true
 SERVER_HOSTNAME: localhost:8080
 SETUP_COMPLETE: true
-SIGNING_ENGINE: gpg2
 TAG_EXPIRATION_OPTIONS:
 - 0s
 - 1d

local-dev/stack/config.yaml

@@ -17,7 +17,6 @@ DISTRIBUTED_STORAGE_PREFERENCE:
 - default
 ENTERPRISE_LOGO_URL: /static/img/quay-horizontal-color.svg
 EXTERNAL_TLS_TERMINATION: true
-FEATURE_ACI_CONVERSION: false
 FEATURE_ANONYMOUS_ACCESS: true
 FEATURE_APP_REGISTRY: false
 FEATURE_APP_SPECIFIC_TOKENS: true
@@ -37,8 +36,6 @@ FEATURE_USER_LOG_ACCESS: true
 GITHUB_LOGIN_CONFIG: {}
 GITHUB_TRIGGER_CONFIG: {}
 GITLAB_TRIGGER_KIND: {}
-GPG2_PRIVATE_KEY_FILENAME: signing-private.gpg
-GPG2_PUBLIC_KEY_FILENAME: signing-public.gpg
 LOG_ARCHIVE_LOCATION: default
 MAIL_DEFAULT_SENDER: admin@example.com
 MAIL_PORT: 587

test/testconfig.py

@@ -56,7 +56,6 @@ def create_transaction(db):
     LICENSE_EXPIRATION_WARNING = datetime.now() + timedelta(weeks=520)
 
     FEATURE_GITHUB_BUILD = True
-    FEATURE_ACI_CONVERSION = True
 
     CLOUDWATCH_NAMESPACE = None
 
@@ -70,12 +69,6 @@ def create_transaction(db):
 
     FEATURE_SIGNING = True
 
-    SIGNING_ENGINE = "gpg2"
-
-    GPG2_PRIVATE_KEY_NAME = "EEB32221"
-    GPG2_PRIVATE_KEY_FILENAME = "test/data/signing-private.gpg"
-    GPG2_PUBLIC_KEY_FILENAME = "test/data/signing-public.gpg"
-
     INSTANCE_SERVICE_KEY_KID_LOCATION = "test/data/test.kid"
     INSTANCE_SERVICE_KEY_LOCATION = "test/data/test.pem"
 

util/config/configdocs/schema.html

@@ -327,16 +327,6 @@
 </div>
 </li>
 <li class="schema item">
-<div class="name">FEATURE_ACI_CONVERSION</div>
-<div class="type">[boolean]</div>
-<div class="required"></div>
-<div class="docs">
-<div class="title"></div>
-<div class="description">Whether to enable conversion to ACIs. Defaults to False</div>
-<div class="x-example">Example: <code>False</code></div>
-</div>
-</li>
-<li class="schema item">
 <div class="name">FEATURE_ACTION_LOG_ROTATION</div>
 <div class="type">[boolean]</div>
 <div class="required"></div>

util/config/configutil.py

@@ -40,7 +40,6 @@ def add_enterprise_config_defaults(config_obj, current_secret_key):
     # Default features that are off.
     config_obj["FEATURE_MAILING"] = config_obj.get("FEATURE_MAILING", False)
     config_obj["FEATURE_BUILD_SUPPORT"] = config_obj.get("FEATURE_BUILD_SUPPORT", False)
-    config_obj["FEATURE_ACI_CONVERSION"] = config_obj.get("FEATURE_ACI_CONVERSION", False)
     config_obj["FEATURE_APP_REGISTRY"] = config_obj.get("FEATURE_APP_REGISTRY", False)
     config_obj["FEATURE_REPO_MIRROR"] = config_obj.get("FEATURE_REPO_MIRROR", False)
 

util/config/provider/testprovider.py

@@ -5,7 +5,7 @@
 
 from util.config.provider.baseprovider import BaseProvider
 
-REAL_FILES = ["test/data/signing-private.gpg", "test/data/signing-public.gpg", "test/data/test.pem"]
+REAL_FILES = ["test/data/test.pem"]
 
 
 class TestConfigProvider(BaseProvider):

util/config/schema.py

@@ -912,12 +912,6 @@
             "description": "Whether or not to rotate old action logs to storage. Defaults to False",
             "x-example": False,
         },
-        # Feature Flag: ACI Conversion.
-        "FEATURE_ACI_CONVERSION": {
-            "type": "boolean",
-            "description": "Whether to enable conversion to ACIs. Defaults to False",
-            "x-example": False,
-        },
         # Feature Flag: Library Support.
         "FEATURE_LIBRARY_SUPPORT": {
             "type": "boolean",

util/config/validator.py

@@ -39,11 +39,8 @@ class ConfigValidationException(Exception):
 # Note: Only add files required for HTTPS to the SSL_FILESNAMES list.
 DB_SSL_FILENAMES = ["database.pem"]
 JWT_FILENAMES = ["jwt-authn.cert"]
-ACI_CERT_FILENAMES = ["signing-public.gpg", "signing-private.gpg"]
 LDAP_FILENAMES = [LDAP_CERT_FILENAME]
-CONFIG_FILENAMES = (
-    SSL_FILENAMES + DB_SSL_FILENAMES + JWT_FILENAMES + ACI_CERT_FILENAMES + LDAP_FILENAMES
-)
+CONFIG_FILENAMES = SSL_FILENAMES + DB_SSL_FILENAMES + JWT_FILENAMES + LDAP_FILENAMES
 CONFIG_FILE_SUFFIXES = ["-cloudfront-signing-key.pem"]
 EXTRA_CA_DIRECTORY = "extra_ca_certs"
 EXTRA_CA_DIRECTORY_PREFIX = "extra_ca_certs_"