From 7bfd3aec7111b9b13dc9161014468873f9496be6 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Wed, 15 Jun 2022 14:46:53 +0200 Subject: [PATCH] target/oci: `OCITargetOptions.FileName` -> `OCITargetOptions.Filename` The `Filename` is defined in each and every target options. Modify its name in the OCI target to be consistent with all other targets. --- cmd/osbuild-worker/jobimpl-osbuild.go | 2 +- internal/target/oci_target.go | 2 +- internal/weldr/upload.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/osbuild-worker/jobimpl-osbuild.go b/cmd/osbuild-worker/jobimpl-osbuild.go index 2c1360d60..54e4b7eac 100644 --- a/cmd/osbuild-worker/jobimpl-osbuild.go +++ b/cmd/osbuild-worker/jobimpl-osbuild.go @@ -716,7 +716,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error { } logWithId.Info("[OCI] 🔑 Logged in OCI") logWithId.Info("[OCI] ⬆ Uploading the image") - file, err := os.Open(path.Join(outputDirectory, exportPath, options.FileName)) + file, err := os.Open(path.Join(outputDirectory, exportPath, options.Filename)) if err != nil { targetResult.TargetError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error()) break diff --git a/internal/target/oci_target.go b/internal/target/oci_target.go index 17f6759ad..cf8e4adcf 100644 --- a/internal/target/oci_target.go +++ b/internal/target/oci_target.go @@ -6,7 +6,7 @@ type OCITargetOptions struct { User string `json:"user"` Tenancy string `json:"tenancy"` Region string `json:"region"` - FileName string `json:"filename"` + Filename string `json:"filename"` Fingerprint string `json:"fingerprint"` PrivateKey string `json:"private_key"` Bucket string `json:"bucket"` diff --git a/internal/weldr/upload.go b/internal/weldr/upload.go index 21b1e22e6..750085d1d 100644 --- a/internal/weldr/upload.go +++ b/internal/weldr/upload.go @@ -326,7 +326,7 @@ func uploadRequestToTarget(u uploadRequest, imageType distro.ImageType) *target. User: options.User, Tenancy: options.Tenancy, Region: options.Region, - FileName: imageType.Filename(), + Filename: imageType.Filename(), PrivateKey: options.PrivateKey, Fingerprint: options.Fingerprint, Bucket: options.Bucket,