feat: add deprecation warning for legal.repoOwner (#268)

bfabio · web-flow · commit f4aaf5709983 · 2025-10-16T14:15:55.000+02:00
diff --git a/fields.go b/fields.go
@@ -118,6 +118,10 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error
 		}
 	}
 
+	if publiccodev0.Legal.RepoOwner != nil {
+		vr = append(vr, ValidationWarning{"legal.repoOwner", "This key is DEPRECATED and will be removed in the future. Use 'organisation.name' instead", 0, 0})
+	}
+
 	if publiccodev0.InputTypes != nil {
 		vr = append(vr, ValidationWarning{"inputTypes", "This key is DEPRECATED and will be removed in the future. It's safe to drop it", 0, 0})
 	}
diff --git a/parser_test.go b/parser_test.go
@@ -105,7 +105,7 @@ func TestValidTestcasesV0_NoNetwork(t *testing.T) {
 func TestValidWithWarningTestcasesV0_NoNetwork(t *testing.T) {
 	expected := map[string]error{
 		"authorsFile.yml": ValidationResults{
-			ValidationWarning{"legal.authorsFile", "This key is DEPRECATED and will be removed in the future. It's safe to drop it", 72, 3},
+			ValidationWarning{"legal.authorsFile", "This key is DEPRECATED and will be removed in the future. It's safe to drop it", 71, 3},
 		},
 	}
 
@@ -626,11 +626,11 @@ func TestInvalidTestcasesV0(t *testing.T) {
 			ValidationError{"IT.riuso.codiceIPA", "codiceIPA must be a valid Italian Public Administration Code (iPA) (see https://www.indicepa.gov.it/public-services/opendata-read-service.php?dstype=FS&filename=amministrazioni.txt)", 55, 5},
 		},
 		"it_IT_duplicated.yml": ValidationResults{
-			ValidationWarning{"it", "Lowercase country codes are DEPRECATED and will be removed in the future. Use 'IT' instead", 120, 1},
-			ValidationError{"it", "'IT' key already present. Remove this key", 120, 1},
+			ValidationWarning{"it", "Lowercase country codes are DEPRECATED and will be removed in the future. Use 'IT' instead", 119, 1},
+			ValidationError{"it", "'IT' key already present. Remove this key", 119, 1},
 		},
 		"it_wrong_case.yml": ValidationResults{
-			ValidationError{"It", "field It not found in type publiccode.PublicCodeV0", 108, 1},
+			ValidationError{"It", "field It not found in type publiccode.PublicCodeV0", 107, 1},
 		},
 
 		// misc
@@ -699,16 +699,19 @@ func TestValidWithWarningsTestcasesV0(t *testing.T) {
 			ValidationWarning{"outputTypes", "This key is DEPRECATED and will be removed in the future. It's safe to drop it", 50, 1},
 		},
 		"valid_with_it_conforme.yml": ValidationResults{
-			ValidationWarning{"IT.conforme", "This key is DEPRECATED and will be removed in the future. It's safe to drop it", 120, 3},
+			ValidationWarning{"IT.conforme", "This key is DEPRECATED and will be removed in the future. It's safe to drop it", 119, 3},
 		},
 		"valid_with_country_specific_section_downcase.yml": ValidationResults{
-			ValidationWarning{"it", "Lowercase country codes are DEPRECATED and will be removed in the future. Use 'IT' instead", 108, 1},
+			ValidationWarning{"it", "Lowercase country codes are DEPRECATED and will be removed in the future. Use 'IT' instead", 107, 1},
 		},
 		"valid_with_lowercase_countries.yml": ValidationResults{
 			ValidationWarning{"intendedAudience.countries[0]", "Lowercase country codes are DEPRECATED. Use uppercase instead ('IT')", 30, 3},
 			ValidationWarning{"intendedAudience.countries[1]", "Lowercase country codes are DEPRECATED. Use uppercase instead ('DE')", 30, 3},
 			ValidationWarning{"intendedAudience.unsupportedCountries[0]", "Lowercase country codes are DEPRECATED. Use uppercase instead ('US')", 30, 3},
 		},
+		"valid_with_legal_repoOwner.yml": ValidationResults{
+			ValidationWarning{"legal.repoOwner", "This key is DEPRECATED and will be removed in the future. Use 'organisation.name' instead", 70, 3},
+		},
 	}
 
 	dir := "testdata/v0/valid_with_warnings/"
diff --git a/testdata/v0/invalid/it_IT_duplicated.yml b/testdata/v0/invalid/it_IT_duplicated.yml
@@ -67,7 +67,6 @@ description:
 legal:
   license: AGPL-3.0-or-later
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "community"
diff --git a/testdata/v0/invalid/it_wrong_case.yml b/testdata/v0/invalid/it_wrong_case.yml
@@ -67,7 +67,6 @@ description:
 legal:
   license: AGPL-3.0-or-later
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "community"
diff --git a/testdata/v0/invalid/landingURL_invalid.yml b/testdata/v0/invalid/landingURL_invalid.yml
@@ -69,7 +69,6 @@ description:
 legal:
   license: AGPL-3.0-or-later # SPDX expression of license
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "contract"
diff --git a/testdata/v0/invalid/landingURL_wrong_type.yml b/testdata/v0/invalid/landingURL_wrong_type.yml
@@ -65,7 +65,6 @@ description:
 legal:
   license: AGPL-3.0-or-later # SPDX expression of license
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "contract"
diff --git a/testdata/v0/invalid/legal_license_missing.yml b/testdata/v0/invalid/legal_license_missing.yml
@@ -19,26 +19,26 @@ description:
   en:
     localisedName: Medusa
     shortDescription: >
-          A rather short description which
-          is probably useless
+      A rather short description which
+      is probably useless
     longDescription: >
-          Very long description of this software, also split
-          on multiple rows. You should note what the software
-          is and why one should need it. This is 158 characters.
-          Very long description of this software, also split
-          on multiple rows. You should note what the software
-          is and why one should need it. This is 316 characters.
-          Very long description of this software, also split
-          on multiple rows. You should note what the software
-          is and why one should need it. This is 474 characters.
-          Very long description of this software, also split
-          on multiple rows. You should note what the software
-          is and why one should need it. This is 632 characters.
+      Very long description of this software, also split
+      on multiple rows. You should note what the software
+      is and why one should need it. This is 158 characters.
+      Very long description of this software, also split
+      on multiple rows. You should note what the software
+      is and why one should need it. This is 316 characters.
+      Very long description of this software, also split
+      on multiple rows. You should note what the software
+      is and why one should need it. This is 474 characters.
+      Very long description of this software, also split
+      on multiple rows. You should note what the software
+      is and why one should need it. This is 632 characters.
     features:
-       - Just one feature
+      - Just one feature
 
 legal:
-  repoOwner: foobar
+  mainCopyrightOwner: foobar
   # Should NOT validate: license is missing
 
 maintenance:
diff --git a/testdata/v0/invalid/no-network/landingURL_invalid.yml b/testdata/v0/invalid/no-network/landingURL_invalid.yml
@@ -69,7 +69,6 @@ description:
 legal:
   license: AGPL-3.0-or-later # SPDX expression of license
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "contract"
diff --git a/testdata/v0/valid/countryExtensionVersion_1.0.yml b/testdata/v0/valid/countryExtensionVersion_1.0.yml
@@ -67,7 +67,6 @@ description:
 legal:
   license: AGPL-3.0-or-later
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "community"
diff --git a/testdata/v0/valid/dependsOn.yml b/testdata/v0/valid/dependsOn.yml
@@ -68,7 +68,6 @@ description:
 legal:
   license: AGPL-3.0-or-later # SPDX expression of license
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "community"
diff --git a/testdata/v0/valid/no-network/valid.yml b/testdata/v0/valid/no-network/valid.yml
@@ -176,7 +176,6 @@ description:
 legal:
   license: AGPL-3.0-or-later
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "contract"
diff --git a/testdata/v0/valid/valid.yml b/testdata/v0/valid/valid.yml
@@ -175,7 +175,6 @@ description:
 legal:
   license: AGPL-3.0-or-later
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "contract"
diff --git a/testdata/v0/valid/valid_no_it_conforme.yml b/testdata/v0/valid/valid_no_it_conforme.yml
@@ -67,7 +67,6 @@ description:
 legal:
   license: AGPL-3.0-or-later
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "community"
diff --git a/testdata/v0/valid/valid_with_country_specific_section_uppercase.yml b/testdata/v0/valid/valid_with_country_specific_section_uppercase.yml
@@ -67,7 +67,6 @@ description:
 legal:
   license: AGPL-3.0-or-later
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "community"
diff --git a/testdata/v0/valid_with_warnings/no-network/authorsFile.yml b/testdata/v0/valid_with_warnings/no-network/authorsFile.yml
@@ -68,7 +68,6 @@ description:
 legal:
   license: AGPL-3.0-or-later # SPDX expression of license
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
   authorsFile: assets/AUTHORS # file listing copyright information
 
 maintenance:
diff --git a/testdata/v0/valid_with_warnings/valid_with_country_specific_section_downcase.yml b/testdata/v0/valid_with_warnings/valid_with_country_specific_section_downcase.yml
@@ -67,7 +67,6 @@ description:
 legal:
   license: AGPL-3.0-or-later
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "community"
diff --git a/testdata/v0/valid_with_warnings/valid_with_it_conforme.yml b/testdata/v0/valid_with_warnings/valid_with_it_conforme.yml
@@ -66,7 +66,6 @@ description:
 legal:
   license: AGPL-3.0-or-later # SPDX expression of license
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "contract"
diff --git a/testdata/v0/valid_with_warnings/valid_with_legal_repoOwner.yml b/testdata/v0/valid_with_warnings/valid_with_legal_repoOwner.yml
@@ -0,0 +1,117 @@
+publiccodeYmlVersion: "0"
+
+name: Medusa
+applicationSuite: MegaProductivitySuite
+url: "https://github.com/italia/developers.italia.it.git"
+
+isBasedOn: "https://github.com/italia/developers.italia.it.git"
+softwareVersion: "1.0"
+releaseDate: 2017-04-15
+
+platforms:
+  - android
+  - ios
+
+categories:
+  - cloud-management
+
+usedBy:
+  - Comune di Firenze
+  - Comune di Roma
+
+roadmap: "https://designers.italia.it/roadmap/"
+
+developmentStatus: development
+
+softwareType: "standalone/other"
+
+intendedAudience:
+  countries:
+    - IT
+    - DE
+  unsupportedCountries:
+    - US
+
+description:
+  en:
+    localisedName: Medusa
+    shortDescription: "A really interesting software."
+    longDescription: >
+      Very long description of this software, also split
+      on multiple rows. You should note what the software
+      is and why one should need it. This is 158 characters.
+      Very long description of this software, also split
+      on multiple rows. You should note what the software
+      is and why one should need it. This is 316 characters.
+      Very long description of this software, also split
+      on multiple rows. You should note what the software
+      is and why one should need it. This is 474 characters.
+      Very long description of this software, also split
+      on multiple rows. You should note what the software
+      is and why one should need it. This is 632 characters.
+
+    documentation: "https://docs.italia.it"
+    apiDocumentation: "https://developers.italia.it/it/api"
+
+    features:
+      - Very important feature
+      - Will run without a problem
+      - Has zero bugs
+      - Solves all the problems of the world
+    videos:
+      - https://www.youtube.com/watch?v=RaHmGbBOP84
+    awards:
+      - 1st Price Software of the year
+
+legal:
+  license: AGPL-3.0-or-later
+  mainCopyrightOwner: City of Chicago
+  # repoOwner is deprecated
+  repoOwner: City of Chicago
+
+maintenance:
+  type: "contract"
+
+  contractors:
+    - name: "Fornitore Privato SPA"
+      website: "https://developers.italia.it"
+      until: "2019-01-01"
+
+  contacts:
+    - name: Francesco Rossi
+      email: "francesco.rossi@comune.reggioemilia.it"
+      affiliation: Comune di Reggio Emilia
+      phone: +39 231 13215112
+    - name: Dario Bianchi
+      email: "dario.bianchi@fornitore.it"
+      affiliation: Fornitore Privato S.P.A.
+      phone: +39 16 24231322
+    - name: Giancarlo Verdi
+      email: "dario.bianchi@fornitore.it"
+      affiliation: Fornitore Privato S.P.A.
+      phone: +39 16 24231322
+
+localisation:
+  localisationReady: true
+  availableLanguages:
+    - en
+    - ita
+    - fra
+    - deu
+
+dependsOn:
+  open:
+    - name: MySQL
+      versionMin: "1.1"
+      versionMax: "1.3"
+      optional: true
+    - name: PostgreSQL
+      version: "3.2"
+      optional: true
+  proprietary:
+    - name: Oracle
+      versionMin: "11.4"
+    - name: IBM SoftLayer
+  hardware:
+    - name: NFC Reader
+      optional: true
diff --git a/testdata/v0/valid_with_warnings/valid_with_lowercase_countries.yml b/testdata/v0/valid_with_warnings/valid_with_lowercase_countries.yml
@@ -67,7 +67,6 @@ description:
 legal:
   license: AGPL-3.0-or-later # SPDX expression of license
   mainCopyrightOwner: City of Chicago
-  repoOwner: City of Chicago
 
 maintenance:
   type: "contract"

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,10 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
	`121`	`+ if publiccodev0.Legal.RepoOwner != nil {`
	`122`	`+ vr = append(vr, ValidationWarning{"legal.repoOwner", "This key is DEPRECATED and will be removed in the future. Use 'organisation.name' instead", 0, 0})`
	`123`	`+ }`
	`124`	`+`
`121`	`125`	`if publiccodev0.InputTypes != nil {`
`122`	`126`	`vr = append(vr, ValidationWarning{"inputTypes", "This key is DEPRECATED and will be removed in the future. It's safe to drop it", 0, 0})`
`123`	`127`	`}`