Skip to content

Commit 09e367a

Browse files
author
serverpod_cloud
committed
test(scloud): b31595f6bb89ef4a0bc5f4aafbb449860650690e
1 parent 81f247c commit 09e367a

4 files changed

Lines changed: 394 additions & 1 deletion

File tree

serverpod_cloud_cli/lib/command_runner/cloud_cli_command_runner.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ class CloudCliCommandRunner extends BetterCommandRunner<GlobalOption, void> {
4141
final CommandLogger logger;
4242
final CloudCliServiceProvider _serviceProvider;
4343

44+
/// If true, analytics will be not be suppressed for non-production usage.
45+
final bool _enableAnalyticsForAllEnvs;
46+
4447
final VersionCommand _versionCommand;
4548

4649
GlobalConfiguration? _globalConfiguration;
@@ -82,10 +85,12 @@ class CloudCliCommandRunner extends BetterCommandRunner<GlobalOption, void> {
8285
required this.logger,
8386
required this.version,
8487
required final CloudCliServiceProvider serviceProvider,
88+
required final bool enableAnalyticsForAllEnvs,
8589
super.onAnalyticsEvent,
8690
super.setLogLevel,
8791
}) : _serviceProvider = serviceProvider,
8892
_versionCommand = VersionCommand(logger: logger),
93+
_enableAnalyticsForAllEnvs = enableAnalyticsForAllEnvs,
8994
super(
9095
'scloud',
9196
'Manage your Serverpod Cloud projects',
@@ -106,12 +111,14 @@ class CloudCliCommandRunner extends BetterCommandRunner<GlobalOption, void> {
106111
final Version? version,
107112
final CloudCliServiceProvider? serviceProvider,
108113
final OnAnalyticsEvent? onAnalyticsEvent,
114+
final bool enableAnalyticsForAllEnvs = false,
109115
bool? adminUserMode,
110116
}) {
111117
final runner = CloudCliCommandRunner._(
112118
logger: logger,
113119
version: version ?? cliVersion,
114120
serviceProvider: serviceProvider ?? CloudCliServiceProvider(),
121+
enableAnalyticsForAllEnvs: enableAnalyticsForAllEnvs,
115122
onAnalyticsEvent: onAnalyticsEvent,
116123
setLogLevel: ({
117124
final String? commandName,
@@ -205,7 +212,7 @@ class CloudCliCommandRunner extends BetterCommandRunner<GlobalOption, void> {
205212
return analyticsOptionValue;
206213
}
207214

208-
if (!_isTenantUser()) {
215+
if (!_enableAnalyticsForAllEnvs && !_isTenantUser()) {
209216
return false;
210217
}
211218

serverpod_cloud_cli/lib/command_runner/commands/settings_command.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ enum CliUserSettingsOption<V> implements OptionDefinition<V> {
1515
}
1616

1717
class CliUserSettingsCommand extends CloudCliCommand<CliUserSettingsOption> {
18+
@override
19+
bool get requireLogin => false;
20+
1821
@override
1922
final name = 'settings';
2023

serverpod_cloud_cli/lib/command_runner/helpers/cloud_cli_service_provider.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class CloudCliServiceProvider {
4444
void shutdown() {
4545
_cloudApiClient?.close();
4646
_cloudApiClient = null;
47+
_scloudSettings = null;
4748
_initialized = false; // enables re-initialization in test runs
4849
}
4950

0 commit comments

Comments
 (0)