particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild: update files source for rhsm

Browse source 
osbuild manifest's urls should now contain a url and any secrets. The
secrets should contain a name.
This commit is contained in:
Jacob Kozol 2020-05-15 17:04:53 +02:00 • committed by Tom Gundersen
parent 387e8c40aa
commit 5938276d3b
5 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/osbuild/source_test.go
View file

@ -53,7 +53,7 @@ func TestSource_UnmarshalJSON(t *testing.T) {
name: "files-empty",
fields: fields{
Name: "org.osbuild.files",
Source: &FilesSource{URLs: map[string]string{}},
Source: &FilesSource{URLs: map[string]FileSource{}},
},
args: args{
data: []byte(`{"org.osbuild.files":{"urls":{}}}`),
@ -62,11 +62,14 @@ func TestSource_UnmarshalJSON(t *testing.T) {
{
name: "files",
fields: fields{
Name: "org.osbuild.files",
Source: &FilesSource{URLs: map[string]string{"checksum1": "url1", "checksum2": "url2"}},
Name: "org.osbuild.files",
Source: &FilesSource{URLs: map[string]FileSource{
"checksum1": FileSource{URL: "url1"},
"checksum2": FileSource{URL: "url2"},
}},
},
args: args{
data: []byte(`{"org.osbuild.files":{"urls":{"checksum1":"url1","checksum2":"url2"}}}`),
data: []byte(`{"org.osbuild.files":{"urls":{"checksum1":{"url":"url1"},"checksum2":{"url":"url2"}}}}`),
},
},
}