feat: require ISO 3166-1 country codes in v1

v1 country codes must be strict ISO 3166-1 alpha-2, uppercase only.

Author: bfabio

fields.go

@@ -318,35 +318,6 @@ func validateFieldsV1(publiccode PublicCode, parser *Parser, network bool, baseU
 		}
 	}
 
-	if publiccodev1.IntendedAudience != nil {
-		// This is not ideal, but we need to revalidate the countries
-		// here, because otherwise we could get a warning and the advice
-		// to use uppercase on an invalid country.
-		if publiccodev1.IntendedAudience.Countries != nil {
-			for i, c := range *publiccodev1.IntendedAudience.Countries {
-				if sharedValidate.Var(c, "iso3166_1_alpha2_lower_or_upper") == nil && c == strings.ToLower(c) {
-					vr = append(vr, ValidationWarning{
-						fmt.Sprintf("intendedAudience.countries[%d]", i),
-						fmt.Sprintf("Lowercase country codes are DEPRECATED. Use uppercase instead ('%s')", strings.ToUpper(c)),
-						0, 0,
-					})
-				}
-			}
-		}
-
-		if publiccodev1.IntendedAudience.UnsupportedCountries != nil {
-			for i, c := range *publiccodev1.IntendedAudience.UnsupportedCountries {
-				if sharedValidate.Var(c, "iso3166_1_alpha2_lower_or_upper") == nil && c == strings.ToLower(c) {
-					vr = append(vr, ValidationWarning{
-						fmt.Sprintf("intendedAudience.unsupportedCountries[%d]", i),
-						fmt.Sprintf("Lowercase country codes are DEPRECATED. Use uppercase instead ('%s')", strings.ToUpper(c)),
-						0, 0,
-					})
-				}
-			}
-		}
-	}
-
 	for lang, desc := range publiccodev1.Description {
 		if checksNetwork && desc.Documentation != nil {
 			if reachable, err := parser.isReachable(*(*url.URL)(desc.Documentation)); !reachable {

fields_v1_test.go

@@ -261,37 +261,6 @@ func TestValidateFieldsV1WithAPIDocNetworkCheck(t *testing.T) {
 	}
 }
 
-func TestValidateFieldsV1WithCountriesDeprecated(t *testing.T) {
-	p, _ := NewParser(ParserConfig{DisableNetwork: true, DisableExternalChecks: true})
-	base := &url.URL{Scheme: "file", Path: "/tmp"}
-
-	countries := []string{"it"} // lowercase - deprecated
-	unsupported := []string{"de"} // lowercase - deprecated
-	locReady := true
-	v1 := &PublicCodeV1{
-		IntendedAudience: &struct {
-			Scope                *[]string `json:"scope,omitempty"                validate:"omitempty,dive,is_scope_v1"                     yaml:"scope,omitempty"`
-			Countries            *[]string `json:"countries,omitempty"            validate:"omitempty,dive,iso3166_1_alpha2_lower_or_upper" yaml:"countries,omitempty"`
-			UnsupportedCountries *[]string `json:"unsupportedCountries,omitempty" validate:"omitempty,dive,iso3166_1_alpha2_lower_or_upper" yaml:"unsupportedCountries,omitempty"`
-		}{
-			Countries:            &countries,
-			UnsupportedCountries: &unsupported,
-		},
-		Localisation: struct {
-			LocalisationReady  *bool    `json:"localisationReady"  validate:"required"                                     yaml:"localisationReady"`
-			AvailableLanguages []string `json:"availableLanguages" validate:"required,gt=0,dive,bcp47_strict_language_tag" yaml:"availableLanguages"`
-		}{
-			LocalisationReady:  &locReady,
-			AvailableLanguages: []string{"en"},
-		},
-	}
-
-	err := validateFieldsV1(v1, p, false, base)
-	if err == nil {
-		t.Error("expected deprecation warnings for lowercase countries")
-	}
-}
-
 func TestValidateFieldsV0MonochromeLogoAbsPath(t *testing.T) {
 	p, _ := NewParser(ParserConfig{DisableNetwork: true, DisableExternalChecks: false})
 	base := &url.URL{Scheme: "file", Path: "/tmp"}

…in_v0/valid_with_lowercase_countries.yml …tdata/v1/invalid/lowercase_countries.ymltestdata/v1/invalid_valid_with_warnings_in_v0/valid_with_lowercase_countries.yml renamed to testdata/v1/invalid/lowercase_countries.yml testdata/v1/invalid_valid_with_warnings_in_v0/valid_with_lowercase_countries.yml renamed to testdata/v1/invalid/lowercase_countries.yml

@@ -80,15 +80,15 @@ maintenance:
     - name: Francesco Rossi
       email: "francesco.rossi@comune.reggioemilia.it"
       affiliation: Comune di Reggio Emilia
-      phone: +39 231 13215112
+      phone: +3923113215112
     - name: Dario Bianchi
       email: "dario.bianchi@fornitore.it"
       affiliation: Fornitore Privato S.P.A.
-      phone: +39 16 24231322
+      phone: +391624231322
     - name: Giancarlo Verdi
       email: "dario.bianchi@fornitore.it"
       affiliation: Fornitore Privato S.P.A.
-      phone: +39 16 24231322
+      phone: +391624231322
 
 localisation:
   localisationReady: true

v1.go

@@ -38,9 +38,9 @@ type PublicCodeV1 struct {
 	SoftwareType string `json:"softwareType" validate:"required,oneof=standalone/mobile standalone/iot standalone/desktop standalone/web standalone/backend standalone/other addon library configurationFiles" yaml:"softwareType"`
 
 	IntendedAudience *struct {
-		Scope                *[]string `json:"scope,omitempty"                validate:"omitempty,dive,is_scope_v1"                     yaml:"scope,omitempty"`
-		Countries            *[]string `json:"countries,omitempty"            validate:"omitempty,dive,iso3166_1_alpha2_lower_or_upper" yaml:"countries,omitempty"`
-		UnsupportedCountries *[]string `json:"unsupportedCountries,omitempty" validate:"omitempty,dive,iso3166_1_alpha2_lower_or_upper" yaml:"unsupportedCountries,omitempty"`
+		Scope                *[]string `json:"scope,omitempty"                validate:"omitempty,dive,is_scope_v1"      yaml:"scope,omitempty"`
+		Countries            *[]string `json:"countries,omitempty"            validate:"omitempty,dive,iso3166_1_alpha2" yaml:"countries,omitempty"`
+		UnsupportedCountries *[]string `json:"unsupportedCountries,omitempty" validate:"omitempty,dive,iso3166_1_alpha2" yaml:"unsupportedCountries,omitempty"`
 	} `json:"intendedAudience,omitempty" yaml:"intendedAudience,omitempty"`
 
 	Description map[string]DescV1 `json:"description" validate:"gt=0,bcp47_keys,dive" yaml:"description"`

v1_test.go

@@ -147,6 +147,11 @@ func TestInvalidTestcasesV1(t *testing.T) {
 		"intendedAudience_countries_invalid_iso_3166_1_alpha_2.yml": ValidationResults{
 			ValidationError{"intendedAudience.countries[2]", "countries[2] must be a valid ISO 3166-1 alpha-2 two-letter country code", 22, 7},
 		},
+		"lowercase_countries.yml": ValidationResults{
+			ValidationError{"intendedAudience.countries[0]", "countries[0] must be a valid ISO 3166-1 alpha-2 two-letter country code", 31, 7},
+			ValidationError{"intendedAudience.countries[1]", "countries[1] must be a valid ISO 3166-1 alpha-2 two-letter country code", 32, 7},
+			ValidationError{"intendedAudience.unsupportedCountries[0]", "unsupportedCountries[0] must be a valid ISO 3166-1 alpha-2 two-letter country code", 34, 7},
+		},
 		"intendedAudience_countries_wrong_type.yml": ValidationResults{
 			ValidationError{"intendedAudience.countries", "wrong type for this field", 19, 1},
 		},

validators/validator.go

@@ -211,6 +211,11 @@ func RegisterLocalErrorMessages(v *validator.Validate, trans ut.Translator) erro
 			tag:         "iso3166_1_alpha2_lower_or_upper",
 			translation: "{0} must be a valid ISO 3166-1 alpha-2 two-letter country code",
 		},
+		{
+			tag:         "iso3166_1_alpha2",
+			override:    true,
+			translation: "{0} must be a valid ISO 3166-1 alpha-2 two-letter country code",
+		},
 		{
 			tag:         "bcp47_strict_language_tag",
 			override:    true,