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

weldr/upload/gcp: make Object optional

Browse source 
Previously, it was expected from the user to provide the Object name
when uploading image to GCP. The object name does not matter much,
because the object is deleted once image import finishes. Make
the specification of the object name optional and generate it if not
provided.

Adjust the GCP Weldr test case to not provide the Object name when
uploading the image.

The user can still provide the Object name if needed.
This commit is contained in:
Tomáš Hozza 2022-09-27 09:14:08 +02:00 • committed by Ondřej Budai
parent dd36fce63c
commit dc476671e4
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/weldr/upload.go
View file

@ -65,7 +65,7 @@ func (azureUploadSettings) isUploadSettings() {}
type gcpUploadSettings struct {
Region string `json:"region"`
Bucket string `json:"bucket"`
Object string `json:"object"`
Object string `json:"object,omitempty"`
// base64 encoded GCP credentials JSON file
Credentials string `json:"credentials,omitempty"`
@ -300,9 +300,13 @@ func uploadRequestToTarget(u uploadRequest, imageType distro.ImageType) *target.
}
}
// The uploaded image object name must have 'tar.gz' suffix to be imported
// Providing the Object name is optional. If it is provided, we must
// ensure that it has a '.tar.gz' suffix to be successfully imported.
// If it is not provided, we will generate a random name.
objectName := options.Object
if !strings.HasSuffix(objectName, ".tar.gz") {
if objectName == "" {
objectName = fmt.Sprintf("composer-api-%s.tar.gz", uuid.New().String())
} else if !strings.HasSuffix(objectName, ".tar.gz") {
objectName = objectName + ".tar.gz"
logrus.Infof("[GCP] object name must end with '.tar.gz', using %q as the object name", objectName)
}