Stop populating the deprecated origin field

mongoose-os · May 12, 2021 · 1aba408 · 1aba408
1 parent e7398f8
commit 1aba408
Show file tree

Hide file tree

Showing 44 changed files with 258 additions and 422 deletions.
diff --git a/cli/build/swmodule.go b/cli/build/swmodule.go
@@ -38,12 +38,12 @@ import (
 )
 
 type SWModule struct {
-	Type string `yaml:"type,omitempty" json:"type,omitempty"`
+	Type     string `yaml:"type,omitempty" json:"type,omitempty"`
+	Name     string `yaml:"name,omitempty" json:"name,omitempty"`
+	Location string `yaml:"location,omitempty" json:"location,omitempty"`
 	// Origin is deprecated since 2017/08/18
 	OriginOld string `yaml:"origin,omitempty" json:"origin,omitempty"`
-	Location  string `yaml:"location,omitempty" json:"location,omitempty"`
 	Version   string `yaml:"version,omitempty" json:"version,omitempty"`
-	Name      string `yaml:"name,omitempty" json:"name,omitempty"`
 	Variant   string `yaml:"variant,omitempty" json:"variant,omitempty"`
 
 	// API used to download binary assets. If not specified, will take a guess based on location.
@@ -184,10 +184,11 @@ func parseGitLocation(loc string) (string, string, string, string, string, strin
 func (m *SWModule) Normalize() error {
 	if m.Location == "" && m.OriginOld != "" {
 		m.Location = m.OriginOld
-	} else {
-		// Just for the compatibility with a bit older fwbuild
-		m.OriginOld = m.Location
 	}
+	if m.Location == "" {
+		return fmt.Errorf("location is not set")
+	}
+	m.OriginOld = ""
 	if m.Name == "" {
 		n, err := m.GetName()
 		if err != nil {

diff --git a/cli/manifest_parser/test_manifests/test_01_nolibs/expected/esp8266/mos_final.yml b/cli/manifest_parser/test_manifests/test_01_nolibs/expected/esp8266/mos_final.yml
@@ -13,9 +13,9 @@ sources:
 filesystem:
 - __APP_ROOT__/app/fs/myfile
 modules:
-- location: https://github.com/cesanta/mongoose-os
+- name: mongoose-os
+  location: https://github.com/cesanta/mongoose-os
   version: 1.2.3
-  name: mongoose-os
 no_implicit_init_deps: true
 build_vars:
   BOARD: ""

diff --git a/cli/manifest_parser/test_manifests/test_02_weak_dep_unused/expected/esp8266/mos_final.yml b/cli/manifest_parser/test_manifests/test_02_weak_dep_unused/expected/esp8266/mos_final.yml
@@ -19,9 +19,9 @@ filesystem:
 - __APP_ROOT__/libs/mylib2/fs/mylib2_file1
 - __APP_ROOT__/libs/mylib3/fs/mylib3_file1
 modules:
-- location: https://github.com/cesanta/mongoose-os
+- name: mongoose-os
+  location: https://github.com/cesanta/mongoose-os
   version: "0.01"
-  name: mongoose-os
 config_schema:
 - - mylib1
   - o
@@ -54,16 +54,14 @@ mongoose_os_version: "0.01"
 manifest_version: "2017-09-29"
 libs_handled:
 - lib:
-    origin: https://github.com/mongoose-os-libs/core
-    location: https://github.com/mongoose-os-libs/core
     name: core
+    location: https://github.com/mongoose-os-libs/core
   path: __APP_ROOT__/libs/core
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib1
-    location: https://github.com/mongoose-os-libs/mylib1
     name: mylib1
+    location: https://github.com/mongoose-os-libs/mylib1
   path: __APP_ROOT__/libs/mylib1
   init_deps:
   - core
@@ -72,9 +70,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib2
-    location: https://github.com/mongoose-os-libs/mylib2
     name: mylib2
+    location: https://github.com/mongoose-os-libs/mylib2
   path: __APP_ROOT__/libs/mylib2
   init_deps:
   - core
@@ -83,9 +80,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib3
-    location: https://github.com/mongoose-os-libs/mylib3
     name: mylib3
+    location: https://github.com/mongoose-os-libs/mylib3
   path: __APP_ROOT__/libs/mylib3
   init_deps:
   - core

diff --git a/cli/manifest_parser/test_manifests/test_03_weak_dep_used/expected/esp8266/mos_final.yml b/cli/manifest_parser/test_manifests/test_03_weak_dep_used/expected/esp8266/mos_final.yml
@@ -22,9 +22,9 @@ filesystem:
 - __APP_ROOT__/libs/mylib4/fs/mylib4_file1
 - __APP_ROOT__/libs/mylib3/fs/mylib3_file1
 modules:
-- location: https://github.com/cesanta/mongoose-os
+- name: mongoose-os
+  location: https://github.com/cesanta/mongoose-os
   version: "0.01"
-  name: mongoose-os
 config_schema:
 - - mylib1
   - o
@@ -62,16 +62,14 @@ mongoose_os_version: "0.01"
 manifest_version: "2017-09-29"
 libs_handled:
 - lib:
-    origin: https://github.com/mongoose-os-libs/core
-    location: https://github.com/mongoose-os-libs/core
     name: core
+    location: https://github.com/mongoose-os-libs/core
   path: __APP_ROOT__/libs/core
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib1
-    location: https://github.com/mongoose-os-libs/mylib1
     name: mylib1
+    location: https://github.com/mongoose-os-libs/mylib1
   path: __APP_ROOT__/libs/mylib1
   init_deps:
   - core
@@ -81,9 +79,8 @@ libs_handled:
   version: "0.01"
   user_version: 1.2.3
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib2
-    location: https://github.com/mongoose-os-libs/mylib2
     name: mylib2
+    location: https://github.com/mongoose-os-libs/mylib2
   path: __APP_ROOT__/libs/mylib2
   init_deps:
   - core
@@ -92,9 +89,8 @@ libs_handled:
   - __APP_ROOT__/libs/mylib2/src/mylib2_src1.c
   version: "0.01"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib4
-    location: https://github.com/mongoose-os-libs/mylib4
     name: mylib4
+    location: https://github.com/mongoose-os-libs/mylib4
   path: __APP_ROOT__/libs/mylib4
   init_deps:
   - core
@@ -103,9 +99,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib3
-    location: https://github.com/mongoose-os-libs/mylib3
     name: mylib3
+    location: https://github.com/mongoose-os-libs/mylib3
   path: __APP_ROOT__/libs/mylib3
   init_deps:
   - core

diff --git a/cli/manifest_parser/test_manifests/test_04_weak_dep_absent/expected/esp8266/mos_final.yml b/cli/manifest_parser/test_manifests/test_04_weak_dep_absent/expected/esp8266/mos_final.yml
@@ -22,9 +22,9 @@ filesystem:
 - __APP_ROOT__/libs/mylib4/fs/mylib4_file1
 - __APP_ROOT__/libs/mylib3/fs/mylib3_file1
 modules:
-- location: https://github.com/cesanta/mongoose-os
+- name: mongoose-os
+  location: https://github.com/cesanta/mongoose-os
   version: "0.01"
-  name: mongoose-os
 config_schema:
 - - mylib1
   - o
@@ -62,16 +62,14 @@ mongoose_os_version: "0.01"
 manifest_version: "2017-09-29"
 libs_handled:
 - lib:
-    origin: https://github.com/mongoose-os-libs/core
-    location: https://github.com/mongoose-os-libs/core
     name: core
+    location: https://github.com/mongoose-os-libs/core
   path: __APP_ROOT__/libs/core
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib1
-    location: https://github.com/mongoose-os-libs/mylib1
     name: mylib1
+    location: https://github.com/mongoose-os-libs/mylib1
   path: __APP_ROOT__/libs/mylib1
   init_deps:
   - core
@@ -80,9 +78,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib2
-    location: https://github.com/mongoose-os-libs/mylib2
     name: mylib2
+    location: https://github.com/mongoose-os-libs/mylib2
   path: __APP_ROOT__/libs/mylib2
   init_deps:
   - core
@@ -91,9 +88,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib4
-    location: https://github.com/mongoose-os-libs/mylib4
     name: mylib4
+    location: https://github.com/mongoose-os-libs/mylib4
   path: __APP_ROOT__/libs/mylib4
   init_deps:
   - core
@@ -102,9 +98,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib3
-    location: https://github.com/mongoose-os-libs/mylib3
     name: mylib3
+    location: https://github.com/mongoose-os-libs/mylib3
   path: __APP_ROOT__/libs/mylib3
   init_deps:
   - core

diff --git a/cli/manifest_parser/test_manifests/test_05_lib_override/expected/esp8266/mos_final.yml b/cli/manifest_parser/test_manifests/test_05_lib_override/expected/esp8266/mos_final.yml
@@ -9,9 +9,9 @@ description: My test app
 sources:
 - __APP_ROOT__/app/build/gen/mgos_deps_init.c
 modules:
-- location: https://github.com/cesanta/mongoose-os
+- name: mongoose-os
+  location: https://github.com/cesanta/mongoose-os
   version: "0.01"
-  name: mongoose-os
 config_schema:
 - - mylib2
   - o
@@ -40,26 +40,23 @@ mongoose_os_version: "0.01"
 manifest_version: "2017-09-29"
 libs_handled:
 - lib:
-    origin: https://github.com/mongoose-os-libs/core
-    location: https://github.com/mongoose-os-libs/core
     name: core
+    location: https://github.com/mongoose-os-libs/core
   path: __APP_ROOT__/libs/core
   version: "0.01"
   user_version: "1.0"
   repo_version: deadbeef
 - lib:
-    origin: libs/mylib2a
-    location: libs/mylib2a
     name: mylib2
+    location: libs/mylib2a
   path: __APP_ROOT__/libs/mylib2a
   init_deps:
   - core
   version: "0.01"
   user_version: "2.0"
 - lib:
-    origin: libs/mylib1
-    location: libs/mylib1
     name: mylib1
+    location: libs/mylib1
   path: __APP_ROOT__/libs/mylib1
   init_deps:
   - core

diff --git a/...conds_switch_with_arch_manifests/test_01_app_doesnt_override/expected/esp32/mos_final.yml b/...conds_switch_with_arch_manifests/test_01_app_doesnt_override/expected/esp32/mos_final.yml
@@ -22,9 +22,9 @@ filesystem:
 - __APP_ROOT__/libs/mylib4/fs/mylib4_file1
 - __APP_ROOT__/libs/mylib3/fs/mylib3_file1
 modules:
-- location: https://github.com/cesanta/mongoose-os
+- name: mongoose-os
+  location: https://github.com/cesanta/mongoose-os
   version: "0.01"
-  name: mongoose-os
 config_schema:
 - - mylib1
   - o
@@ -71,16 +71,14 @@ mongoose_os_version: "0.01"
 manifest_version: "2017-09-29"
 libs_handled:
 - lib:
-    origin: https://github.com/mongoose-os-libs/core
-    location: https://github.com/mongoose-os-libs/core
     name: core
+    location: https://github.com/mongoose-os-libs/core
   path: __APP_ROOT__/libs/core
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib1
-    location: https://github.com/mongoose-os-libs/mylib1
     name: mylib1
+    location: https://github.com/mongoose-os-libs/mylib1
   path: __APP_ROOT__/libs/mylib1
   init_deps:
   - core
@@ -89,9 +87,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib2
-    location: https://github.com/mongoose-os-libs/mylib2
     name: mylib2
+    location: https://github.com/mongoose-os-libs/mylib2
   path: __APP_ROOT__/libs/mylib2
   init_deps:
   - core
@@ -100,9 +97,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib4
-    location: https://github.com/mongoose-os-libs/mylib4
     name: mylib4
+    location: https://github.com/mongoose-os-libs/mylib4
   path: __APP_ROOT__/libs/mylib4
   init_deps:
   - core
@@ -111,9 +107,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib3
-    location: https://github.com/mongoose-os-libs/mylib3
     name: mylib3
+    location: https://github.com/mongoose-os-libs/mylib3
   path: __APP_ROOT__/libs/mylib3
   init_deps:
   - core

diff --git a/...nds_switch_with_arch_manifests/test_01_app_doesnt_override/expected/esp8266/mos_final.yml b/...nds_switch_with_arch_manifests/test_01_app_doesnt_override/expected/esp8266/mos_final.yml
@@ -23,9 +23,9 @@ filesystem:
 - __APP_ROOT__/libs/mylib4/fs/mylib4_file1
 - __APP_ROOT__/libs/mylib3/fs/mylib3_file1
 modules:
-- location: https://github.com/cesanta/mongoose-os
+- name: mongoose-os
+  location: https://github.com/cesanta/mongoose-os
   version: "0.01"
-  name: mongoose-os
 config_schema:
 - - mylib1
   - o
@@ -70,16 +70,14 @@ mongoose_os_version: "0.01"
 manifest_version: "2017-09-29"
 libs_handled:
 - lib:
-    origin: https://github.com/mongoose-os-libs/core
-    location: https://github.com/mongoose-os-libs/core
     name: core
+    location: https://github.com/mongoose-os-libs/core
   path: __APP_ROOT__/libs/core
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib1
-    location: https://github.com/mongoose-os-libs/mylib1
     name: mylib1
+    location: https://github.com/mongoose-os-libs/mylib1
   path: __APP_ROOT__/libs/mylib1
   init_deps:
   - core
@@ -88,9 +86,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib2
-    location: https://github.com/mongoose-os-libs/mylib2
     name: mylib2
+    location: https://github.com/mongoose-os-libs/mylib2
   path: __APP_ROOT__/libs/mylib2
   init_deps:
   - core
@@ -99,9 +96,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib4
-    location: https://github.com/mongoose-os-libs/mylib4
     name: mylib4
+    location: https://github.com/mongoose-os-libs/mylib4
   path: __APP_ROOT__/libs/mylib4
   init_deps:
   - core
@@ -111,9 +107,8 @@ libs_handled:
   version: "0.01"
   user_version: "1.0"
 - lib:
-    origin: https://github.com/mongoose-os-libs/mylib3
-    location: https://github.com/mongoose-os-libs/mylib3
     name: mylib3
+    location: https://github.com/mongoose-os-libs/mylib3
   path: __APP_ROOT__/libs/mylib3
   init_deps:
   - core