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:
dependabot[bot]
Tomáš Hozza
parent
22a0452ea9
commit
76b224c6a9
19 changed files with 87 additions and 120 deletions
10
go.mod
10
go.mod
|
|
@ -46,7 +46,7 @@ require (
|
|||
github.com/labstack/gommon v0.4.2
|
||||
github.com/openshift-online/ocm-sdk-go v0.1.438
|
||||
github.com/oracle/oci-go-sdk/v54 v54.0.0
|
||||
github.com/osbuild/images v0.80.0
|
||||
github.com/osbuild/images v0.81.0
|
||||
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
|
||||
github.com/osbuild/pulp-client v0.1.0
|
||||
github.com/prometheus/client_golang v1.20.2
|
||||
|
|
@ -60,7 +60,7 @@ require (
|
|||
golang.org/x/oauth2 v0.22.0
|
||||
golang.org/x/sync v0.8.0
|
||||
golang.org/x/sys v0.24.0
|
||||
google.golang.org/api v0.194.0
|
||||
google.golang.org/api v0.195.0
|
||||
)
|
||||
|
||||
require (
|
||||
|
|
@ -68,7 +68,7 @@ require (
|
|||
cloud.google.com/go/auth v0.9.1 // indirect
|
||||
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
|
||||
cloud.google.com/go/compute/metadata v0.5.0 // indirect
|
||||
cloud.google.com/go/iam v1.1.12 // indirect
|
||||
cloud.google.com/go/iam v1.1.13 // indirect
|
||||
dario.cat/mergo v1.0.0 // indirect
|
||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
|
||||
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
|
||||
|
|
@ -231,9 +231,9 @@ require (
|
|||
golang.org/x/text v0.17.0 // indirect
|
||||
golang.org/x/time v0.6.0 // indirect
|
||||
golang.org/x/tools v0.24.0 // indirect
|
||||
google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect
|
||||
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect
|
||||
google.golang.org/grpc v1.65.0 // indirect
|
||||
google.golang.org/protobuf v1.34.2 // indirect
|
||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||
|
|
|
|||
24
go.sum
24
go.sum
|
|
@ -9,10 +9,10 @@ cloud.google.com/go/compute v1.28.0 h1:OPtBxMcheSS+DWfci803qvPly3d4w7Eu5ztKBcFfz
|
|||
cloud.google.com/go/compute v1.28.0/go.mod h1:DEqZBtYrDnD5PvjsKwb3onnhX+qjdCVM7eshj1XdjV4=
|
||||
cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
|
||||
cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
|
||||
cloud.google.com/go/iam v1.1.12 h1:JixGLimRrNGcxvJEQ8+clfLxPlbeZA6MuRJ+qJNQ5Xw=
|
||||
cloud.google.com/go/iam v1.1.12/go.mod h1:9LDX8J7dN5YRyzVHxwQzrQs9opFFqn0Mxs9nAeB+Hhg=
|
||||
cloud.google.com/go/longrunning v0.5.11 h1:Havn1kGjz3whCfoD8dxMLP73Ph5w+ODyZB9RUsDxtGk=
|
||||
cloud.google.com/go/longrunning v0.5.11/go.mod h1:rDn7//lmlfWV1Dx6IB4RatCPenTwwmqXuiP0/RgoEO4=
|
||||
cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4=
|
||||
cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus=
|
||||
cloud.google.com/go/longrunning v0.5.12 h1:5LqSIdERr71CqfUsFlJdBpOkBH8FBCFD7P1nTWy3TYE=
|
||||
cloud.google.com/go/longrunning v0.5.12/go.mod h1:S5hMV8CDJ6r50t2ubVJSKQVv5u0rmik5//KgLO3k4lU=
|
||||
cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs=
|
||||
cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0=
|
||||
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
|
||||
|
|
@ -510,8 +510,8 @@ github.com/openshift-online/ocm-sdk-go v0.1.438 h1:tsLCCUzbLCTL4RZG02y9RuopmGCXp
|
|||
github.com/openshift-online/ocm-sdk-go v0.1.438/go.mod h1:CiAu2jwl3ITKOxkeV0Qnhzv4gs35AmpIzVABQLtcI2Y=
|
||||
github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXchUUZ+LS4=
|
||||
github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc=
|
||||
github.com/osbuild/images v0.80.0 h1:+Ra0qYrTj8v5eUfk1VG/NMHQiTfsNGrcTrj2aCawiSM=
|
||||
github.com/osbuild/images v0.80.0/go.mod h1:mcBIJoSTCuglH2+yaIp7VOos/N+9E2VrHlJvejd/4Vg=
|
||||
github.com/osbuild/images v0.81.0 h1:p5v94tFL5StKvsyshkZ1flPiq7mt11RKt/vbzTuWDbA=
|
||||
github.com/osbuild/images v0.81.0/go.mod h1:1kJyvTtEbJfRv00phwd9Dlkai4/V05JhNACglxFTxS8=
|
||||
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ=
|
||||
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U=
|
||||
github.com/osbuild/pulp-client v0.1.0 h1:L0C4ezBJGTamN3BKdv+rKLuq/WxXJbsFwz/Hj7aEmJ8=
|
||||
|
|
@ -815,19 +815,19 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
|
|||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/api v0.194.0 h1:dztZKG9HgtIpbI35FhfuSNR/zmaMVdxNlntHj1sIS4s=
|
||||
google.golang.org/api v0.194.0/go.mod h1:AgvUFdojGANh3vI+P7EVnxj3AISHllxGCJSFmggmnd0=
|
||||
google.golang.org/api v0.195.0 h1:Ude4N8FvTKnnQJHU48RFI40jOBgIrL8Zqr3/QeST6yU=
|
||||
google.golang.org/api v0.195.0/go.mod h1:DOGRWuv3P8TU8Lnz7uQc4hyNqrBpMtD9ppW3wBJurgc=
|
||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
|
||||
google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 h1:oLiyxGgE+rt22duwci1+TG7bg2/L1LQsXwfjPlmuJA0=
|
||||
google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4=
|
||||
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c h1:TYOEhrQMrNDTAd2rX9m+WgGr8Ku6YNuj1D7OX6rWSok=
|
||||
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c/go.mod h1:2rC5OendXvZ8wGEo/cSLheztrZDZaSoHanUcd1xtZnw=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c h1:Kqjm4WpoWvwhMPcrAczoTyMySQmYa9Wy2iL6Con4zn8=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
|
||||
|
|
|
|||
7
vendor/cloud.google.com/go/iam/CHANGES.md
generated
vendored
7
vendor/cloud.google.com/go/iam/CHANGES.md
generated
vendored
|
|
@ -1,6 +1,13 @@
|
|||
# Changes
|
||||
|
||||
|
||||
## [1.1.13](https://github.com/googleapis/google-cloud-go/compare/iam/v1.1.12...iam/v1.1.13) (2024-08-08)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **iam:** Update google.golang.org/api to v0.191.0 ([5b32644](https://github.com/googleapis/google-cloud-go/commit/5b32644eb82eb6bd6021f80b4fad471c60fb9d73))
|
||||
|
||||
## [1.1.12](https://github.com/googleapis/google-cloud-go/compare/iam/v1.1.11...iam/v1.1.12) (2024-07-24)
|
||||
|
||||
|
||||
|
|
|
|||
8
vendor/github.com/osbuild/images/pkg/disk/btrfs.go
generated
vendored
8
vendor/github.com/osbuild/images/pkg/disk/btrfs.go
generated
vendored
|
|
@ -25,10 +25,6 @@ func (b *Btrfs) EntityName() string {
|
|||
return "btrfs"
|
||||
}
|
||||
|
||||
func (b *Btrfs) IsContainer() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (b *Btrfs) Clone() Entity {
|
||||
if b == nil {
|
||||
return nil
|
||||
|
|
@ -122,10 +118,6 @@ type BtrfsSubvolume struct {
|
|||
UUID string
|
||||
}
|
||||
|
||||
func (subvol *BtrfsSubvolume) IsContainer() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (bs *BtrfsSubvolume) Clone() Entity {
|
||||
if bs == nil {
|
||||
return nil
|
||||
|
|
|
|||
4
vendor/github.com/osbuild/images/pkg/disk/disk.go
generated
vendored
4
vendor/github.com/osbuild/images/pkg/disk/disk.go
generated
vendored
|
|
@ -60,10 +60,6 @@ const (
|
|||
|
||||
// Entity is the base interface for all disk-related entities.
|
||||
type Entity interface {
|
||||
// IsContainer indicates if the implementing type can
|
||||
// contain any other entities.
|
||||
IsContainer() bool
|
||||
|
||||
// Clone returns a deep copy of the entity.
|
||||
Clone() Entity
|
||||
}
|
||||
|
|
|
|||
4
vendor/github.com/osbuild/images/pkg/disk/filesystem.go
generated
vendored
4
vendor/github.com/osbuild/images/pkg/disk/filesystem.go
generated
vendored
|
|
@ -31,10 +31,6 @@ func (fs *Filesystem) EntityName() string {
|
|||
return "filesystem"
|
||||
}
|
||||
|
||||
func (fs *Filesystem) IsContainer() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// Clone the filesystem structure
|
||||
func (fs *Filesystem) Clone() Entity {
|
||||
if fs == nil {
|
||||
|
|
|
|||
4
vendor/github.com/osbuild/images/pkg/disk/luks.go
generated
vendored
4
vendor/github.com/osbuild/images/pkg/disk/luks.go
generated
vendored
|
|
@ -58,10 +58,6 @@ func (lc *LUKSContainer) EntityName() string {
|
|||
return "luks"
|
||||
}
|
||||
|
||||
func (lc *LUKSContainer) IsContainer() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (lc *LUKSContainer) GetItemCount() uint {
|
||||
if lc.Payload == nil {
|
||||
return 0
|
||||
|
|
|
|||
8
vendor/github.com/osbuild/images/pkg/disk/lvm.go
generated
vendored
8
vendor/github.com/osbuild/images/pkg/disk/lvm.go
generated
vendored
|
|
@ -27,10 +27,6 @@ func (vg *LVMVolumeGroup) EntityName() string {
|
|||
return "lvm"
|
||||
}
|
||||
|
||||
func (vg *LVMVolumeGroup) IsContainer() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (vg *LVMVolumeGroup) Clone() Entity {
|
||||
if vg == nil {
|
||||
return nil
|
||||
|
|
@ -170,10 +166,6 @@ type LVMLogicalVolume struct {
|
|||
Payload Entity
|
||||
}
|
||||
|
||||
func (lv *LVMLogicalVolume) IsContainer() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (lv *LVMLogicalVolume) Clone() Entity {
|
||||
if lv == nil {
|
||||
return nil
|
||||
|
|
|
|||
4
vendor/github.com/osbuild/images/pkg/disk/partition.go
generated
vendored
4
vendor/github.com/osbuild/images/pkg/disk/partition.go
generated
vendored
|
|
@ -21,10 +21,6 @@ type Partition struct {
|
|||
Payload PayloadEntity
|
||||
}
|
||||
|
||||
func (p *Partition) IsContainer() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (p *Partition) Clone() Entity {
|
||||
if p == nil {
|
||||
return nil
|
||||
|
|
|
|||
5
vendor/github.com/osbuild/images/pkg/disk/partition_table.go
generated
vendored
5
vendor/github.com/osbuild/images/pkg/disk/partition_table.go
generated
vendored
|
|
@ -160,10 +160,6 @@ func NewPartitionTable(basePT *PartitionTable, mountpoints []blueprint.Filesyste
|
|||
return newPT, nil
|
||||
}
|
||||
|
||||
func (pt *PartitionTable) IsContainer() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (pt *PartitionTable) Clone() Entity {
|
||||
if pt == nil {
|
||||
return nil
|
||||
|
|
@ -785,6 +781,7 @@ func (pt *PartitionTable) ensureBtrfs() error {
|
|||
Mountpoint: "/",
|
||||
Compress: DefaultBtrfsCompression,
|
||||
ReadOnly: opts.ReadOnly(),
|
||||
Size: part.Size,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
1
vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/ami.go
generated
vendored
1
vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/ami.go
generated
vendored
|
|
@ -163,7 +163,6 @@ func ec2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
|
|||
"dhcpcd",
|
||||
"yum-utils",
|
||||
"dracut-config-generic",
|
||||
"gdisk",
|
||||
"grub2",
|
||||
"langpacks-en",
|
||||
"NetworkManager-cloud-setup",
|
||||
|
|
|
|||
1
vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/azure.go
generated
vendored
1
vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/azure.go
generated
vendored
|
|
@ -68,7 +68,6 @@ func azureCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
|
|||
"cloud-utils-growpart",
|
||||
"dracut-config-generic",
|
||||
"efibootmgr",
|
||||
"gdisk",
|
||||
"hyperv-daemons",
|
||||
"kernel-core",
|
||||
"kernel-modules",
|
||||
|
|
|
|||
41
vendor/github.com/osbuild/images/pkg/osbuild/bootupd_stage.go
generated
vendored
41
vendor/github.com/osbuild/images/pkg/osbuild/bootupd_stage.go
generated
vendored
|
|
@ -89,7 +89,7 @@ func genMountsForBootupd(source string, pt *disk.PartitionTable) ([]Mount, error
|
|||
continue
|
||||
}
|
||||
|
||||
// TODO: support things like LVM here via supporting "disk.Container"
|
||||
// TODO: support things like LUKS here via supporting "disk.Container"?
|
||||
switch payload := part.Payload.(type) {
|
||||
case disk.Mountable:
|
||||
mount, err := genOsbuildMount(source, payload)
|
||||
|
|
@ -107,6 +107,20 @@ func genMountsForBootupd(source string, pt *disk.PartitionTable) ([]Mount, error
|
|||
mount.Partition = common.ToPtr(idx + 1)
|
||||
mounts = append(mounts, *mount)
|
||||
}
|
||||
case *disk.LVMVolumeGroup:
|
||||
for i := range payload.LogicalVolumes {
|
||||
lv := &payload.LogicalVolumes[i]
|
||||
mountable, ok := lv.Payload.(disk.Mountable)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("expected LV payload %+[1]v to be mountable, got %[1]T", lv.Payload)
|
||||
}
|
||||
mount, err := genOsbuildMount(lv.Name, mountable)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
mount.Source = lv.Name
|
||||
mounts = append(mounts, *mount)
|
||||
}
|
||||
default:
|
||||
return nil, fmt.Errorf("type %T not supported by bootupd handling yet", part.Payload)
|
||||
}
|
||||
|
|
@ -119,8 +133,7 @@ func genMountsForBootupd(source string, pt *disk.PartitionTable) ([]Mount, error
|
|||
return mounts, nil
|
||||
}
|
||||
|
||||
func GenBootupdDevicesMounts(filename string, pt *disk.PartitionTable, pltf platform.Platform) (map[string]Device, []Mount, error) {
|
||||
devName := "disk"
|
||||
func genDevicesForBootupd(filename, devName string, pt *disk.PartitionTable) (map[string]Device, error) {
|
||||
devices := map[string]Device{
|
||||
devName: Device{
|
||||
Type: "org.osbuild.loopback",
|
||||
|
|
@ -130,6 +143,28 @@ func GenBootupdDevicesMounts(filename string, pt *disk.PartitionTable, pltf plat
|
|||
},
|
||||
},
|
||||
}
|
||||
for idx, part := range pt.Partitions {
|
||||
switch payload := part.Payload.(type) {
|
||||
case *disk.LVMVolumeGroup:
|
||||
for _, lv := range payload.LogicalVolumes {
|
||||
// partitions start with "1", so add "1"
|
||||
partNum := idx + 1
|
||||
devices[lv.Name] = *NewLVM2LVDevice(devName, &LVM2LVDeviceOptions{Volume: lv.Name, VGPartnum: common.ToPtr(partNum)})
|
||||
}
|
||||
default:
|
||||
// nothing
|
||||
}
|
||||
}
|
||||
|
||||
return devices, nil
|
||||
}
|
||||
|
||||
func GenBootupdDevicesMounts(filename string, pt *disk.PartitionTable, pltf platform.Platform) (map[string]Device, []Mount, error) {
|
||||
devName := "disk"
|
||||
devices, err := genDevicesForBootupd(filename, devName, pt)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
mounts, err := genMountsForBootupd(devName, pt)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
|
|
|
|||
2
vendor/github.com/osbuild/images/pkg/osbuild/lvm2_lv_device.go
generated
vendored
2
vendor/github.com/osbuild/images/pkg/osbuild/lvm2_lv_device.go
generated
vendored
|
|
@ -5,6 +5,8 @@ package osbuild
|
|||
type LVM2LVDeviceOptions struct {
|
||||
// Logical volume to activate
|
||||
Volume string `json:"volume"`
|
||||
// The partition the volume group is located on
|
||||
VGPartnum *int `json:"vg_partnum,omitempty"`
|
||||
}
|
||||
|
||||
func (LVM2LVDeviceOptions) isDeviceOptions() {}
|
||||
|
|
|
|||
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
|
||||
}
|
||||
|
|
|
|||
2
vendor/google.golang.org/api/internal/version.go
generated
vendored
2
vendor/google.golang.org/api/internal/version.go
generated
vendored
|
|
@ -5,4 +5,4 @@
|
|||
package internal
|
||||
|
||||
// Version is the current tagged release of the library.
|
||||
const Version = "0.194.0"
|
||||
const Version = "0.195.0"
|
||||
|
|
|
|||
14
vendor/google.golang.org/api/storage/v1/storage-api.json
generated
vendored
14
vendor/google.golang.org/api/storage/v1/storage-api.json
generated
vendored
|
|
@ -43,7 +43,7 @@
|
|||
"location": "me-central2"
|
||||
}
|
||||
],
|
||||
"etag": "\"34373939373134303235393739323331393435\"",
|
||||
"etag": "\"38363036373236373330353534313035333932\"",
|
||||
"icons": {
|
||||
"x16": "https://www.google.com/images/icons/product/cloud_storage-16.png",
|
||||
"x32": "https://www.google.com/images/icons/product/cloud_storage-32.png"
|
||||
|
|
@ -4136,7 +4136,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"revision": "20240809",
|
||||
"revision": "20240819",
|
||||
"rootUrl": "https://storage.googleapis.com/",
|
||||
"schemas": {
|
||||
"AnywhereCache": {
|
||||
|
|
@ -4349,6 +4349,11 @@
|
|||
"format": "int64",
|
||||
"type": "string"
|
||||
},
|
||||
"hardDeleteTime": {
|
||||
"description": "The hard delete time of the bucket in RFC 3339 format.",
|
||||
"format": "date-time",
|
||||
"type": "string"
|
||||
},
|
||||
"hierarchicalNamespace": {
|
||||
"description": "The bucket's hierarchical namespace configuration.",
|
||||
"properties": {
|
||||
|
|
@ -4675,6 +4680,11 @@
|
|||
},
|
||||
"type": "object"
|
||||
},
|
||||
"softDeleteTime": {
|
||||
"description": "The soft delete time of the bucket in RFC 3339 format.",
|
||||
"format": "date-time",
|
||||
"type": "string"
|
||||
},
|
||||
"storageClass": {
|
||||
"description": "The bucket's default storage class, used whenever no storageClass is specified for a newly-created object. This defines how objects in the bucket are stored and determines the SLA and the cost of storage. Values include MULTI_REGIONAL, REGIONAL, STANDARD, NEARLINE, COLDLINE, ARCHIVE, and DURABLE_REDUCED_AVAILABILITY. If this value is not specified when the bucket is created, it will default to STANDARD. For more information, see [Storage Classes](https://cloud.google.com/storage/docs/storage-classes).",
|
||||
"type": "string"
|
||||
|
|
|
|||
4
vendor/google.golang.org/api/storage/v1/storage-gen.go
generated
vendored
4
vendor/google.golang.org/api/storage/v1/storage-gen.go
generated
vendored
|
|
@ -463,6 +463,8 @@ type Bucket struct {
|
|||
Etag string `json:"etag,omitempty"`
|
||||
// Generation: The generation of this bucket.
|
||||
Generation int64 `json:"generation,omitempty,string"`
|
||||
// HardDeleteTime: The hard delete time of the bucket in RFC 3339 format.
|
||||
HardDeleteTime string `json:"hardDeleteTime,omitempty"`
|
||||
// HierarchicalNamespace: The bucket's hierarchical namespace configuration.
|
||||
HierarchicalNamespace *BucketHierarchicalNamespace `json:"hierarchicalNamespace,omitempty"`
|
||||
// IamConfiguration: The bucket's IAM configuration.
|
||||
|
|
@ -525,6 +527,8 @@ type Bucket struct {
|
|||
// of time that soft-deleted objects will be retained, and cannot be
|
||||
// permanently deleted.
|
||||
SoftDeletePolicy *BucketSoftDeletePolicy `json:"softDeletePolicy,omitempty"`
|
||||
// SoftDeleteTime: The soft delete time of the bucket in RFC 3339 format.
|
||||
SoftDeleteTime string `json:"softDeleteTime,omitempty"`
|
||||
// StorageClass: The bucket's default storage class, used whenever no
|
||||
// storageClass is specified for a newly-created object. This defines how
|
||||
// objects in the bucket are stored and determines the SLA and the cost of
|
||||
|
|
|
|||
10
vendor/modules.txt
vendored
10
vendor/modules.txt
vendored
|
|
@ -31,7 +31,7 @@ cloud.google.com/go/compute/internal
|
|||
# cloud.google.com/go/compute/metadata v0.5.0
|
||||
## explicit; go 1.20
|
||||
cloud.google.com/go/compute/metadata
|
||||
# cloud.google.com/go/iam v1.1.12
|
||||
# cloud.google.com/go/iam v1.1.13
|
||||
## explicit; go 1.20
|
||||
cloud.google.com/go/iam
|
||||
cloud.google.com/go/iam/apiv1/iampb
|
||||
|
|
@ -947,7 +947,7 @@ github.com/oracle/oci-go-sdk/v54/identity
|
|||
github.com/oracle/oci-go-sdk/v54/objectstorage
|
||||
github.com/oracle/oci-go-sdk/v54/objectstorage/transfer
|
||||
github.com/oracle/oci-go-sdk/v54/workrequests
|
||||
# github.com/osbuild/images v0.80.0
|
||||
# github.com/osbuild/images v0.81.0
|
||||
## explicit; go 1.21.0
|
||||
github.com/osbuild/images/internal/common
|
||||
github.com/osbuild/images/internal/environment
|
||||
|
|
@ -1334,7 +1334,7 @@ golang.org/x/tools/internal/gocommand
|
|||
golang.org/x/tools/internal/gopathwalk
|
||||
golang.org/x/tools/internal/imports
|
||||
golang.org/x/tools/internal/stdlib
|
||||
# google.golang.org/api v0.194.0
|
||||
# google.golang.org/api v0.195.0
|
||||
## explicit; go 1.21
|
||||
google.golang.org/api/googleapi
|
||||
google.golang.org/api/googleapi/transport
|
||||
|
|
@ -1352,7 +1352,7 @@ google.golang.org/api/transport
|
|||
google.golang.org/api/transport/grpc
|
||||
google.golang.org/api/transport/http
|
||||
google.golang.org/api/transport/http/internal/propagation
|
||||
# google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142
|
||||
# google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c
|
||||
## explicit; go 1.21
|
||||
google.golang.org/genproto/googleapis/cloud/extendedops
|
||||
google.golang.org/genproto/googleapis/type/date
|
||||
|
|
@ -1361,7 +1361,7 @@ google.golang.org/genproto/googleapis/type/expr
|
|||
## explicit; go 1.21
|
||||
google.golang.org/genproto/googleapis/api
|
||||
google.golang.org/genproto/googleapis/api/annotations
|
||||
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142
|
||||
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c
|
||||
## explicit; go 1.21
|
||||
google.golang.org/genproto/googleapis/rpc/code
|
||||
google.golang.org/genproto/googleapis/rpc/errdetails
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue