diff --git a/config/parser_test.go b/config/parser_test.go index 3caf366..87e30ed 100644 --- a/config/parser_test.go +++ b/config/parser_test.go @@ -28,10 +28,6 @@ func TestParseConfig(t *testing.T) { if err != nil { t.Error(err) } - - if config.Sharing.IncludeCountry == false { - t.Error("country should be included") - } } func TestUpdateConfig(t *testing.T) { @@ -61,7 +57,6 @@ func TestUpdateConfig(t *testing.T) { } origIncludeIP := config.Sharing.IncludeIP origIncludeASN := config.Sharing.IncludeASN - origIncludeCountry := config.Sharing.IncludeCountry origUploadResults := config.Sharing.UploadResults origInformedConsent := config.InformedConsent if err != nil { @@ -87,9 +82,6 @@ func TestUpdateConfig(t *testing.T) { if newConfig.Sharing.IncludeASN != origIncludeASN { t.Error("includeASN differs") } - if newConfig.Sharing.IncludeCountry != origIncludeCountry { - t.Error("includeCountry differs") - } if newConfig.Sharing.UploadResults != origUploadResults { t.Error("UploadResults differs") } diff --git a/config/settings.go b/config/settings.go index 9cb046b..e36a346 100644 --- a/config/settings.go +++ b/config/settings.go @@ -37,7 +37,6 @@ var websiteCategories = []string{ type Sharing struct { IncludeIP bool `json:"include_ip"` IncludeASN bool `json:"include_asn"` - IncludeCountry bool `json:"include_country"` UploadResults bool `json:"upload_results"` } diff --git a/internal/cli/onboard/onboard.go b/internal/cli/onboard/onboard.go index ef55bb9..943c16a 100644 --- a/internal/cli/onboard/onboard.go +++ b/internal/cli/onboard/onboard.go @@ -76,13 +76,11 @@ func Onboarding(config *config.Config) error { settings := struct { IncludeIP bool IncludeNetwork bool - IncludeCountry bool UploadResults bool SendCrashReports bool }{} settings.IncludeIP = false settings.IncludeNetwork = true - settings.IncludeCountry = true settings.UploadResults = true settings.SendCrashReports = true @@ -99,13 +97,6 @@ func Onboarding(config *config.Config) error { Default: true, }, }, - { - Name: "IncludeCountry", - Prompt: &survey.Confirm{ - Message: "Can we include your country name?", - Default: true, - }, - }, { Name: "UploadResults", Prompt: &survey.Confirm{ @@ -131,7 +122,6 @@ func Onboarding(config *config.Config) error { config.Lock() config.InformedConsent = true - config.Sharing.IncludeCountry = settings.IncludeCountry config.Advanced.SendCrashReports = settings.SendCrashReports config.Sharing.IncludeIP = settings.IncludeIP config.Sharing.IncludeASN = settings.IncludeNetwork diff --git a/internal/cli/run/run.go b/internal/cli/run/run.go index f64f136..0701283 100644 --- a/internal/cli/run/run.go +++ b/internal/cli/run/run.go @@ -116,7 +116,8 @@ func init() { // Make sure we share what the user wants us to share. ctx.Session.SetIncludeProbeIP(ctx.Config.Sharing.IncludeIP) ctx.Session.SetIncludeProbeASN(ctx.Config.Sharing.IncludeASN) - ctx.Session.SetIncludeProbeCC(ctx.Config.Sharing.IncludeCountry) + // Always include probe_cc + ctx.Session.SetIncludeProbeCC(true) return nil })