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

weldr/upload: stop setting Filename in gcpUploadSettings

Browse source 
The `Filename` previously set in the `gcpUploadSettings` does not
provide any value. It is the filename of the image as produced by
osbuild for a given export. It may not correspond with the object name
when the image is uploaded to GCP storage and may not even correspond
with the image name after it is imported to GCE. Stop setting the value
and remove the variable from data structures.

This change should not have any impact on backward compatibility,
because the field will be ignored when (Un)Marshalling.
This commit is contained in:
Tomas Hozza 2022-06-17 16:34:49 +02:00 • committed by Tom Gundersen
parent 8c8468cd33
commit eda691971c
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/weldr/upload.go
View file

@ -62,10 +62,9 @@ type azureUploadSettings struct {
func (azureUploadSettings) isUploadSettings() {}
type gcpUploadSettings struct {
Filename string `json:"filename"`
Region string `json:"region"`
Bucket string `json:"bucket"`
Object string `json:"object"`
Region string `json:"region"`
Bucket string `json:"bucket"`
Object string `json:"object"`
// base64 encoded GCP credentials JSON file
Credentials string `json:"credentials,omitempty"`
@ -208,10 +207,9 @@ func targetsToUploadResponses(targets []*target.Target, state ComposeState) []up
case *target.GCPTargetOptions:
upload.ProviderName = "gcp"
upload.Settings = &gcpUploadSettings{
Filename: options.Filename,
Region: options.Region,
Bucket: options.Bucket,
Object: options.Object,
Region: options.Region,
Bucket: options.Bucket,
Object: options.Object,
// Credentials are intentionally not included.
}
uploads = append(uploads, upload)