@@ -9,6 +9,8 @@ use sputnik::{Command, Report, SputnikError};
9
9
use std:: collections:: HashMap ;
10
10
11
11
const TELEMETRY_URL : & str = "https://install.apollographql.workers.dev/telemetry" ;
12
+ const ROVER_VERSION : & str = env ! ( "CARGO_PKG_VERSION" ) ;
13
+ const ROVER_NAME : & str = env ! ( "CARGO_PKG_NAME" ) ;
12
14
13
15
fn get_command_from_args ( mut raw_arguments : & mut serde_json:: Value ) -> Command {
14
16
let mut commands = Vec :: new ( ) ;
@@ -96,11 +98,11 @@ impl Report for Rover {
96
98
}
97
99
98
100
fn tool_name ( & self ) -> String {
99
- env ! ( "CARGO_PKG_NAME" ) . to_string ( )
101
+ ROVER_NAME . to_string ( )
100
102
}
101
103
102
104
fn version ( & self ) -> String {
103
- env ! ( "CARGO_PKG_VERSION" ) . to_string ( )
105
+ ROVER_VERSION . to_string ( )
104
106
}
105
107
106
108
fn machine_id_config ( & self ) -> Result < PathBuf , SputnikError > {
@@ -124,10 +126,11 @@ mod tests {
124
126
125
127
use std:: collections:: HashMap ;
126
128
129
+ use super :: ROVER_NAME ;
130
+
127
131
#[ test]
128
132
fn it_can_serialize_commands ( ) {
129
- let cli_name = env ! ( "CARGO_PKG_NAME" ) ;
130
- let args = vec ! [ cli_name, "config" , "list" ] ;
133
+ let args = vec ! [ ROVER_NAME , "config" , "list" ] ;
131
134
let rover = Rover :: from_iter ( args) ;
132
135
let actual_serialized_command = rover
133
136
. serialize_command ( )
@@ -141,8 +144,7 @@ mod tests {
141
144
142
145
#[ test]
143
146
fn it_can_serialize_commands_with_arguments ( ) {
144
- let cli_name = env ! ( "CARGO_PKG_NAME" ) ;
145
- let args = vec ! [ cli_name, "config" , "show" , "default" , "--sensitive" ] ;
147
+ let args = vec ! [ ROVER_NAME , "config" , "show" , "default" , "--sensitive" ] ;
146
148
let rover = Rover :: from_iter ( args) ;
147
149
let actual_serialized_command = rover
148
150
. serialize_command ( )
@@ -159,8 +161,7 @@ mod tests {
159
161
#[ test]
160
162
fn it_respects_apollo_telemetry_url ( ) {
161
163
let apollo_telemetry_url = "https://example.com/telemetry" ;
162
- let cli_name = env ! ( "CARGO_PKG_NAME" ) ;
163
- let args = vec ! [ cli_name, "config" , "list" ] ;
164
+ let args = vec ! [ ROVER_NAME , "config" , "list" ] ;
164
165
let mut rover = Rover :: from_iter ( args) ;
165
166
rover
166
167
. env_store
@@ -176,8 +177,7 @@ mod tests {
176
177
177
178
#[ test]
178
179
fn it_can_be_disabled ( ) {
179
- let cli_name = env ! ( "CARGO_PKG_NAME" ) ;
180
- let args = vec ! [ cli_name, "config" , "list" ] ;
180
+ let args = vec ! [ ROVER_NAME , "config" , "list" ] ;
181
181
let mut rover = Rover :: from_iter ( args) ;
182
182
rover. env_store . insert ( RoverEnvKey :: TelemetryDisabled , "1" ) ;
183
183
let expect_enabled = false ;
@@ -188,8 +188,7 @@ mod tests {
188
188
189
189
#[ test]
190
190
fn it_is_enabled_by_default ( ) {
191
- let cli_name = env ! ( "CARGO_PKG_NAME" ) ;
192
- let args = vec ! [ cli_name, "config" , "list" ] ;
191
+ let args = vec ! [ ROVER_NAME , "config" , "list" ] ;
193
192
let rover = Rover :: from_iter ( args) ;
194
193
let expect_enabled = true ;
195
194
let is_telemetry_enabled = rover. is_telemetry_enabled ( ) . unwrap ( ) ;
0 commit comments