From 491daa3e7de702d9ee2691a10df25bf43139a5df Mon Sep 17 00:00:00 2001 From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:54:08 -0600 Subject: [PATCH] =?UTF-8?q?"qa"=20=E2=86=92=20"internal"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change should have no user impact. It renames "qa" to "internal" for clarity. --- Scripts/bump_build_tag.py | 4 +- Scripts/feature_flags_internal.py | 10 +++++ Scripts/feature_flags_qa.py | 13 ++++-- SignalMessaging/utils/DebugLogger.m | 2 +- SignalServiceKit/src/Util/FeatureFlags.swift | 42 ++++++++++---------- fastlane/Fastfile | 2 +- 6 files changed, 46 insertions(+), 27 deletions(-) create mode 100755 Scripts/feature_flags_internal.py diff --git a/Scripts/bump_build_tag.py b/Scripts/bump_build_tag.py index 36753f0827..3ca5a58e5c 100755 --- a/Scripts/bump_build_tag.py +++ b/Scripts/bump_build_tag.py @@ -274,7 +274,9 @@ def get_tag_variant(args): argument_tag = "beta" current_flag = feature_flags_common.get_feature_flag() - if current_flag in ["dev", "internalPreview", "qa"]: + + # Some of these flags are legacy. + if current_flag in ["dev", "internalPreview", "internal", "qa"]: feature_flag_tag = "internal" elif current_flag in ["beta", "openPreview"]: feature_flag_tag = "beta" diff --git a/Scripts/feature_flags_internal.py b/Scripts/feature_flags_internal.py new file mode 100755 index 0000000000..c226094f43 --- /dev/null +++ b/Scripts/feature_flags_internal.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python3 +import feature_flags_common + + +def main(): + feature_flags_common.set_feature_flags("internal") + + +if __name__ == "__main__": + main() diff --git a/Scripts/feature_flags_qa.py b/Scripts/feature_flags_qa.py index fea3f2845c..fcd961a472 100755 --- a/Scripts/feature_flags_qa.py +++ b/Scripts/feature_flags_qa.py @@ -1,5 +1,12 @@ #!/usr/bin/env python3 -import feature_flags_common +from sys import stderr +from time import sleep +from feature_flags_internal import main -if __name__ == '__main__': - feature_flags_common.set_feature_flags('qa') +if __name__ == "__main__": + print("❗️ feature_flags_qa.py is deprecated.", file=stderr) + print("Waiting a moment to make sure you see this message...", file=stderr) + + sleep(3) + + main() diff --git a/SignalMessaging/utils/DebugLogger.m b/SignalMessaging/utils/DebugLogger.m index 0284f6617c..a673f45d61 100644 --- a/SignalMessaging/utils/DebugLogger.m +++ b/SignalMessaging/utils/DebugLogger.m @@ -101,7 +101,7 @@ const NSUInteger kMaxDebugLogFileSize = 1024 * 1024 * 3; self.fileLogger.rollingFrequency = kDayInterval; if (SSKDebugFlags.extraDebugLogs) { - // Keep extra log files in internal/QA builds. + // Keep extra log files in internal builds. self.fileLogger.logFileManager.maximumNumberOfLogFiles = 32; } else { // Keep last 3 days of logs - or last 3 logs (if logs rollover due to max file size). diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift index cfa9bf6800..8093ad34a6 100644 --- a/SignalServiceKit/src/Util/FeatureFlags.swift +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -8,7 +8,7 @@ import Foundation private enum FeatureBuild: Int { case dev case internalPreview - case qa + case `internal` case openPreview case beta case production @@ -20,7 +20,7 @@ extension FeatureBuild { } } -private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .qa +private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .internal // MARK: - @@ -56,16 +56,16 @@ extension StorageMode: CustomStringConvertible { @objc(SSKFeatureFlags) public class FeatureFlags: BaseFlags { @objc - public static let phoneNumberSharing = build.includes(.qa) + public static let phoneNumberSharing = build.includes(.internal) @objc - public static let phoneNumberDiscoverability = build.includes(.qa) + public static let phoneNumberDiscoverability = build.includes(.internal) @objc - public static let usernames = build.includes(.qa) + public static let usernames = build.includes(.internal) @objc - public static let linkedPhones = build.includes(.qa) + public static let linkedPhones = build.includes(.internal) // We keep this feature flag around as we may want to // ship a build that disables the dependency on KBS @@ -137,7 +137,7 @@ extension FeatureFlags { featureFlagString = LocalizationNotNeeded("Development") case .internalPreview: featureFlagString = LocalizationNotNeeded("Internal Preview") - case .qa: + case .internal: featureFlagString = LocalizationNotNeeded("Internal") case .openPreview: featureFlagString = LocalizationNotNeeded("Open Preview") @@ -207,12 +207,12 @@ public class DebugFlags: BaseFlags { public static let testPopulationErrorAlerts = build.includes(.beta) @objc - public static let audibleErrorLogging = build.includes(.qa) + public static let audibleErrorLogging = build.includes(.internal) @objc - public static let internalSettings = build.includes(.qa) + public static let internalSettings = build.includes(.internal) - public static let internalMegaphoneEligible = build.includes(.qa) + public static let internalMegaphoneEligible = build.includes(.internal) // This can be used to shut down various background operations. @objc @@ -291,7 +291,7 @@ public class DebugFlags: BaseFlags { public static let groupsV2ignoreCorruptInvites = false @objc - public static let groupsV2memberStatusIndicators = build.includes(.qa) + public static let groupsV2memberStatusIndicators = build.includes(.internal) @objc public static let isMessageProcessingVerbose = false @@ -314,25 +314,25 @@ public class DebugFlags: BaseFlags { public static let showContextMenuDebugRects = false @objc - public static let verboseNotificationLogging = build.includes(.qa) + public static let verboseNotificationLogging = build.includes(.internal) @objc - public static let verboseSignalRecipientLogging = build.includes(.qa) + public static let verboseSignalRecipientLogging = build.includes(.internal) @objc - public static let deviceTransferVerboseProgressLogging = build.includes(.qa) + public static let deviceTransferVerboseProgressLogging = build.includes(.internal) @objc - public static let reactWithThumbsUpFromLockscreen = build.includes(.qa) + public static let reactWithThumbsUpFromLockscreen = build.includes(.internal) @objc - public static let messageDetailsExtraInfo = build.includes(.qa) + public static let messageDetailsExtraInfo = build.includes(.internal) @objc - public static let exposeCensorshipCircumvention = build.includes(.qa) + public static let exposeCensorshipCircumvention = build.includes(.internal) @objc - public static let allowV1GroupsUpdates = build.includes(.qa) + public static let allowV1GroupsUpdates = build.includes(.internal) @objc public static let forceGroupCalling = build.includes(.beta) @@ -369,10 +369,10 @@ public class DebugFlags: BaseFlags { public static let fastPerfTests = false @objc - public static let forceDonorBadgeDisplay = build.includes(.qa) + public static let forceDonorBadgeDisplay = build.includes(.internal) @objc - public static let forceSubscriptionMegaphone = build.includes(.qa) + public static let forceSubscriptionMegaphone = build.includes(.internal) @objc public static let extraDebugLogs = build.includes(.openPreview) @@ -575,7 +575,7 @@ public class TestableFlag: NSObject { @objc public func get() -> Bool { - guard build.includes(.qa) else { + guard build.includes(.internal) else { return defaultValue } return flag.get() diff --git a/fastlane/Fastfile b/fastlane/Fastfile index be8c0e6f4b..93c37f76d6 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -88,7 +88,7 @@ lane :release do |options| changelog: "nightly-#{Time.now.strftime('%m-%d-%Y')}", notify_external_testers: true, distribute_external: true, - groups: %w(Internal QA) + groups: ['Internal'] ) else upload_to_testflight(