From 2d60e036937de51068bc267d8c0d89332966f6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
Date: Wed, 12 Aug 2020 10:45:30 +0200
Subject: _elementsources.py: Fix source names in unique key

The goal was to include the source plugin kind in the element cache key
as the unique key of a source may not be unique across different source
plugins. This is the source equivalent of the `element-plugin-name`
value in the element cache key.

However, `Source._get_source_name()` was the wrong method for this as
that also includes the key itself, which may not even be set yet.

This results in a cache key change.

Fixes: 3953bcc6 ("element.py: clobber sources with workspace")
---
 src/buildstream/_elementsources.py                | 2 +-
 tests/cachekey/project/elements/build1.expected   | 2 +-
 tests/cachekey/project/elements/build2.expected   | 2 +-
 tests/cachekey/project/elements/compose1.expected | 2 +-
 tests/cachekey/project/elements/compose2.expected | 2 +-
 tests/cachekey/project/elements/compose3.expected | 2 +-
 tests/cachekey/project/elements/compose4.expected | 2 +-
 tests/cachekey/project/elements/compose5.expected | 2 +-
 tests/cachekey/project/elements/import1.expected  | 2 +-
 tests/cachekey/project/elements/import2.expected  | 2 +-
 tests/cachekey/project/elements/import3.expected  | 2 +-
 tests/cachekey/project/elements/script1.expected  | 2 +-
 tests/cachekey/project/sources/bzr1.expected      | 2 +-
 tests/cachekey/project/sources/git1.expected      | 2 +-
 tests/cachekey/project/sources/git2.expected      | 2 +-
 tests/cachekey/project/sources/git3.expected      | 2 +-
 tests/cachekey/project/sources/local1.expected    | 2 +-
 tests/cachekey/project/sources/local2.expected    | 2 +-
 tests/cachekey/project/sources/patch1.expected    | 2 +-
 tests/cachekey/project/sources/patch2.expected    | 2 +-
 tests/cachekey/project/sources/patch3.expected    | 2 +-
 tests/cachekey/project/sources/pip1.expected      | 2 +-
 tests/cachekey/project/sources/remote1.expected   | 2 +-
 tests/cachekey/project/sources/remote2.expected   | 2 +-
 tests/cachekey/project/sources/tar1.expected      | 2 +-
 tests/cachekey/project/sources/tar2.expected      | 2 +-
 tests/cachekey/project/sources/zip1.expected      | 2 +-
 tests/cachekey/project/sources/zip2.expected      | 2 +-
 tests/cachekey/project/target.expected            | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/buildstream/_elementsources.py b/src/buildstream/_elementsources.py
index fdb404b67..c1ffc0919 100644
--- a/src/buildstream/_elementsources.py
+++ b/src/buildstream/_elementsources.py
@@ -197,7 +197,7 @@ class ElementSources:
         result = []
 
         for source in self._sources:
-            result.append({"key": source._get_unique_key(), "name": source._get_source_name()})
+            result.append({"key": source._get_unique_key(), "name": source.get_kind()})
 
         return result
 
diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected
index 352d23014..ea0e6149b 100644
--- a/tests/cachekey/project/elements/build1.expected
+++ b/tests/cachekey/project/elements/build1.expected
@@ -1 +1 @@
-f8781566f1c225e9fbc40f7bf7a79b54da1df44573a3ca2d596269f1f929f6db
\ No newline at end of file
+c1fe5551061270c60ef2eb9c1953f5beb8ff0527f4901acdcc22432c5e7ad4d9
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected
index f55596acc..4b63a3f98 100644
--- a/tests/cachekey/project/elements/build2.expected
+++ b/tests/cachekey/project/elements/build2.expected
@@ -1 +1 @@
-39f2221cb0021ca5c759515a3cc37dbf65fc9883e7e55e54f492034d641391e5
\ No newline at end of file
+4caa10b4218f57141c1ab917f0fcd70941924638e4f49762a03bba5b26f5a595
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected
index 641773205..e1977f0d5 100644
--- a/tests/cachekey/project/elements/compose1.expected
+++ b/tests/cachekey/project/elements/compose1.expected
@@ -1 +1 @@
-024cc9f232d5eb23f608c8364c4ec411c173a959b2ad9b219c824bbe4f474757
\ No newline at end of file
+8b7347f544092fd32ad6521f13410fa81f2bae5167f00ea512c0969cf5d7b48b
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected
index 699dec476..f4b02be6d 100644
--- a/tests/cachekey/project/elements/compose2.expected
+++ b/tests/cachekey/project/elements/compose2.expected
@@ -1 +1 @@
-aa6f0f41b37a1dd739168b04959689488a89b1fb295d555a89b751a62152a9cb
\ No newline at end of file
+c6dbef79391a184499557e951cb168062b3eda7cdffe81c4984472b6a3d74339
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected
index e7e97c8e4..d2a987420 100644
--- a/tests/cachekey/project/elements/compose3.expected
+++ b/tests/cachekey/project/elements/compose3.expected
@@ -1 +1 @@
-a318560514f09bb96d8e15fd09c862ffa3ed7c06876b9ba94f8076951d29ca7f
\ No newline at end of file
+474a2615be874dae877b54cce5a6f8fea2c02225219abeb14519c848b71c37cc
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected
index 22d824e0c..cbb10d163 100644
--- a/tests/cachekey/project/elements/compose4.expected
+++ b/tests/cachekey/project/elements/compose4.expected
@@ -1 +1 @@
-9494aaf4193cf9eae4a5013e51d65b28f5180be45dc228d767b04e294ecf2b13
\ No newline at end of file
+71a9dcafacbc0ed1eb9564b2d9c3943a5d46879cff11fdc0689e72c29e947c99
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected
index 381097a6e..0ea43e3ce 100644
--- a/tests/cachekey/project/elements/compose5.expected
+++ b/tests/cachekey/project/elements/compose5.expected
@@ -1 +1 @@
-e5d18ce350380ef6525a38e0ad4e8f4e83571ddd89dcb0218429b64415be9333
\ No newline at end of file
+0686d70ec2a631eabf958ad1a7e82bb2920942a1359615229318244339404c23
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected
index e284a0c57..b5057db9f 100644
--- a/tests/cachekey/project/elements/import1.expected
+++ b/tests/cachekey/project/elements/import1.expected
@@ -1 +1 @@
-116df541e3513ebb01ed652bda6cb1c0fae8a93ac990e9ffae2b579b59b3a77c
\ No newline at end of file
+93dc103c1ee3bc274c0eb890d3bbfadf2ce1f9ecbd4afee6b61214e767328611
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected
index 26cf63c63..f8959f981 100644
--- a/tests/cachekey/project/elements/import2.expected
+++ b/tests/cachekey/project/elements/import2.expected
@@ -1 +1 @@
-bd023e73889798330c3faa6a7b1adce060f5533363714c1d689cbb0a9411f8f7
\ No newline at end of file
+20e3392d96420c5313b6ea9a008b3bedf019b391f7d791bdd60fae6bbf71e5fc
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected
index a8628997f..b5f400086 100644
--- a/tests/cachekey/project/elements/import3.expected
+++ b/tests/cachekey/project/elements/import3.expected
@@ -1 +1 @@
-48b8ffe9a09840bd88225c360824f60869cbb99909ebd2da59987fb5d06b02a0
\ No newline at end of file
+9e719da7bf09081c218ef1b5613a65b58a8478e5f46f937a81e241cab4247da5
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected
index ab5ddb634..7374fe9e5 100644
--- a/tests/cachekey/project/elements/script1.expected
+++ b/tests/cachekey/project/elements/script1.expected
@@ -1 +1 @@
-53ddb2bea53b02478388263a770e7a52fa806a5f44861ff0a08b9c4d67a7ee2a
\ No newline at end of file
+f11de354ac71ab209a0515686ae609a813d31855f50536ee1cf93a0851dde64c
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/bzr1.expected b/tests/cachekey/project/sources/bzr1.expected
index 39aef7888..912b3a8a1 100644
--- a/tests/cachekey/project/sources/bzr1.expected
+++ b/tests/cachekey/project/sources/bzr1.expected
@@ -1 +1 @@
-5cce55b7c73d89bda839cd6dc89763b8dbcc2d6ce11924219d1a4b052ad707cf
\ No newline at end of file
+e485371c3d3055b8d9666a4be231b0eb6747145d9c83954dd95a2df25b40b152
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git1.expected b/tests/cachekey/project/sources/git1.expected
index 4d3eeac29..d7628ee2a 100644
--- a/tests/cachekey/project/sources/git1.expected
+++ b/tests/cachekey/project/sources/git1.expected
@@ -1 +1 @@
-c7bffb1549796cfc88d64637c3da6f3aa55440c2b9690a69441116d870d513c5
\ No newline at end of file
+79acaa26ea2cc8bd1ffaee92d88f3a2043390d2d5ba8528f397949b08e454d5f
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git2.expected b/tests/cachekey/project/sources/git2.expected
index dd9b8406a..034a4519d 100644
--- a/tests/cachekey/project/sources/git2.expected
+++ b/tests/cachekey/project/sources/git2.expected
@@ -1 +1 @@
-a53b0ff331291f483b489386babab0bb628a8beb08ffb20b2fb697f44660ada8
\ No newline at end of file
+9e3ea2835e29ca4a66f750126a0d64636fcc36744057be485d62d940d41dbf84
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git3.expected b/tests/cachekey/project/sources/git3.expected
index 36066af15..7f14d4853 100644
--- a/tests/cachekey/project/sources/git3.expected
+++ b/tests/cachekey/project/sources/git3.expected
@@ -1 +1 @@
-fd29b9a8810ccad865dae57d08ea3fc52ec88753621007a5ea0f1bb7887d019c
\ No newline at end of file
+5dbc9678d2745acfb147c32cd8c68ad6919aa6004cb8a3d635a7ac47da9c8437
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected
index cd4d88520..b9a130cf9 100644
--- a/tests/cachekey/project/sources/local1.expected
+++ b/tests/cachekey/project/sources/local1.expected
@@ -1 +1 @@
-ce06b21e8f3673bea6d3fa521099a26abe1ba89da996b24c9f9df1270ec4d33b
\ No newline at end of file
+64ff0a8d320d3a7c3bf27a5a0a897f1ef0854d38721f92fdbecb03b1029b9c2d
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected
index 48f41026e..1e216c2cc 100644
--- a/tests/cachekey/project/sources/local2.expected
+++ b/tests/cachekey/project/sources/local2.expected
@@ -1 +1 @@
-bb58f6f866f208fdd9cd23787ac86053da3d9323b4f0c3fbecd35dce8fcbd6f7
\ No newline at end of file
+c2274d309979d7f3f13a27aae65088e8348aec7b818096a42daa8253387bbde0
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch1.expected b/tests/cachekey/project/sources/patch1.expected
index e133afc3f..e08887415 100644
--- a/tests/cachekey/project/sources/patch1.expected
+++ b/tests/cachekey/project/sources/patch1.expected
@@ -1 +1 @@
-bd8de9888211ae39c3bb0e14466b78da5f15bcdcfcd5858973a76e23619f6b73
\ No newline at end of file
+b26ee38a5bba930fd3161ffa4e86c72cffe3eee4d6ed863587dafa7dae19275a
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch2.expected b/tests/cachekey/project/sources/patch2.expected
index dd245317c..6840ca3c6 100644
--- a/tests/cachekey/project/sources/patch2.expected
+++ b/tests/cachekey/project/sources/patch2.expected
@@ -1 +1 @@
-069e0cb51948634bdf29259717895a1e899fac530b8510f0e5e9cbdf9b33a9f8
\ No newline at end of file
+44c701a3beb5ee91d8f10749ee9081ddc808567a84905d8e3f3d56357b98be14
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch3.expected b/tests/cachekey/project/sources/patch3.expected
index e2b526292..ccb8595fa 100644
--- a/tests/cachekey/project/sources/patch3.expected
+++ b/tests/cachekey/project/sources/patch3.expected
@@ -1 +1 @@
-71ef2b3f0e5eac0cd7f56d0602af82e97e80055a6b4fbe6b9595267fb9c8ab9d
\ No newline at end of file
+08a0ef6633022338ac29c51d645bb1f38d31416541e7faa21740b31a1be04dc8
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/pip1.expected b/tests/cachekey/project/sources/pip1.expected
index 8a0bf5881..5c3843182 100644
--- a/tests/cachekey/project/sources/pip1.expected
+++ b/tests/cachekey/project/sources/pip1.expected
@@ -1 +1 @@
-2b93d5b622a17115bda7f580c05a5d746431c61301cf29f0b36c9b653bf9463d
\ No newline at end of file
+d5232928f6420fd95a07cc268f8e3eeb3562fc1162bdb96acc8ea44cc459cc76
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote1.expected b/tests/cachekey/project/sources/remote1.expected
index 2c75c7c94..1bcc4fde0 100644
--- a/tests/cachekey/project/sources/remote1.expected
+++ b/tests/cachekey/project/sources/remote1.expected
@@ -1 +1 @@
-7e52b9c9005c0d6ea444c9297f6562b2eb1f8b7b0ed74fb4581ec6ccaae35101
\ No newline at end of file
+9ce089870d66b6ec5dc7a4686b04af00db9c04adab521aecec067419e83701ab
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote2.expected b/tests/cachekey/project/sources/remote2.expected
index a2a399a3c..6ceb4ae83 100644
--- a/tests/cachekey/project/sources/remote2.expected
+++ b/tests/cachekey/project/sources/remote2.expected
@@ -1 +1 @@
-fe91c1a4d59fc8073b98ada139e62da6209faa6e17096cec97f4fef927bd9679
\ No newline at end of file
+14544535e10cc377fb2443e3e87025dce1c0be03f7a69b3a0a6fe1a7af7191b3
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar1.expected b/tests/cachekey/project/sources/tar1.expected
index b5ab5f31e..e686318ea 100644
--- a/tests/cachekey/project/sources/tar1.expected
+++ b/tests/cachekey/project/sources/tar1.expected
@@ -1 +1 @@
-ecd3f8768ecc37052ca3b929edb05157b10024a0b2d8995bd2eda16cf755bcfe
\ No newline at end of file
+f04fd7f059d136021c306b89130802c81e3baf8103ab9e84fe20a3af28815693
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar2.expected b/tests/cachekey/project/sources/tar2.expected
index e7eb10e96..3b25c45f5 100644
--- a/tests/cachekey/project/sources/tar2.expected
+++ b/tests/cachekey/project/sources/tar2.expected
@@ -1 +1 @@
-0026613732373bda64502c4ca942a436ed5498a7a2d6e0527f79f726565f5a74
\ No newline at end of file
+bf581c0f1724b1a574dfa5ffaadc096db4b8f80a0f9b337cf6a867d12dfd6ecd
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip1.expected b/tests/cachekey/project/sources/zip1.expected
index b27d58922..3b41d3c42 100644
--- a/tests/cachekey/project/sources/zip1.expected
+++ b/tests/cachekey/project/sources/zip1.expected
@@ -1 +1 @@
-197ea9e8673273005d5b4b79aaab7acbe8286284af311e36287d700780254025
\ No newline at end of file
+eddd2c6bcf2f805874d7a852a18eccaa9c9c5006ccf1e44e2389908f3beb16a0
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip2.expected b/tests/cachekey/project/sources/zip2.expected
index ccd5eb938..da524df15 100644
--- a/tests/cachekey/project/sources/zip2.expected
+++ b/tests/cachekey/project/sources/zip2.expected
@@ -1 +1 @@
-2652e99bba39e2dc71b5a877585ed4420a726a0d627dad4782e3929532ad1c02
\ No newline at end of file
+d236514ddd135f2fdc81a2cb1912aef66fb7b0c616e3a652f81d4b61592baf02
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index 7a7d19287..887bc59b9 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-2b32b391b0b4c37a00cde24c7904461ff9a646b0506d7de2b412f379558f7650
\ No newline at end of file
+e51a1db8dc54b50c92a9a18d505d2d580854a6f6dae346ed5f89310775233ab4
\ No newline at end of file
-- 
cgit v1.2.1