build(deps): bump the go-deps group across 1 directory with 2 updates
Bumps the go-deps group with 1 update in the / directory: [github.com/osbuild/images](https://github.com/osbuild/images). Updates `github.com/osbuild/images` from 0.80.0 to 0.81.0 - [Release notes](https://github.com/osbuild/images/releases) - [Commits](https://github.com/osbuild/images/compare/v0.80.0...v0.81.0) Updates `google.golang.org/api` from 0.194.0 to 0.195.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.194.0...v0.195.0) --- updated-dependencies: - dependency-name: github.com/osbuild/images dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
parent
22a0452ea9
commit
76b224c6a9
19 changed files with 87 additions and 120 deletions
54
vendor/github.com/osbuild/images/pkg/rpmmd/repository.go
generated
vendored
54
vendor/github.com/osbuild/images/pkg/rpmmd/repository.go
generated
vendored
|
|
@ -326,57 +326,3 @@ func (packages PackageList) ToPackageInfos() []PackageInfo {
|
|||
|
||||
return results
|
||||
}
|
||||
|
||||
// Backwards compatibility for old workers:
|
||||
// This was added since the custom repository
|
||||
// PR changes the baseurl field to a list of baseurls.
|
||||
// This can be removed after 3 releases since the
|
||||
// old-worker-regression test tests the current
|
||||
// osbuild-composer with a worker from 3 releases ago
|
||||
func (r RepoConfig) MarshalJSON() ([]byte, error) {
|
||||
type aliasType RepoConfig
|
||||
type compatType struct {
|
||||
aliasType
|
||||
|
||||
BaseURL string `json:"baseurl,omitempty"`
|
||||
}
|
||||
compatRepo := compatType{
|
||||
aliasType: aliasType(r),
|
||||
}
|
||||
|
||||
var baseUrl string
|
||||
if len(r.BaseURLs) > 0 {
|
||||
baseUrl = strings.Join(r.BaseURLs, ",")
|
||||
}
|
||||
|
||||
compatRepo.BaseURL = baseUrl
|
||||
|
||||
return json.Marshal(compatRepo)
|
||||
}
|
||||
|
||||
// Backwards compatibility for old workers:
|
||||
// This was added since the custom repository
|
||||
// PR changes the baseurl field to a list of baseurls.
|
||||
// This can be removed after 3 releases since the
|
||||
// old-worker-regression test tests the current
|
||||
// osbuild-composer with a worker from 3 releases ago
|
||||
func (r *RepoConfig) UnmarshalJSON(data []byte) error {
|
||||
type aliasType RepoConfig
|
||||
type compatType struct {
|
||||
aliasType
|
||||
|
||||
BaseURL string `json:"baseurl,omitempty"`
|
||||
}
|
||||
|
||||
var compatRepo compatType
|
||||
if err := json.Unmarshal(data, &compatRepo); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if compatRepo.BaseURL != "" {
|
||||
compatRepo.BaseURLs = strings.Split(compatRepo.BaseURL, ",")
|
||||
}
|
||||
|
||||
*r = RepoConfig(compatRepo.aliasType)
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue