ff95059748
Add new internal upload target for Google Cloud Platform and osbuild-upload-gcp CLI tool which uses the API. Supported features are: - Authenticate with GCP using explicitly provided JSON credentials file or let the authentication be handled automatically by the Google cloud client library. The later is useful e.g. when the worker is running in GCP VM instance, which has associated permissions with it. - Upload an existing image file into existing Storage bucket. - Verify MD5 checksum of the uploaded image file against the local file's checksum. - Import the uploaded image file into Compute Node as an Image. - Delete the uploaded image file after a successful image import. - Delete all cache files from storage created as part of the image import build job. - Share the imported image with a list of specified accounts. GCP-specific image type is not yet added, since GCP supports importing VMDK and VHD images, which the osbuild-composer already supports. Update go.mod, vendor/ content and SPEC file with new dependencies. Signed-off-by: Tomas Hozza <thozza@redhat.com>
54 lines
1.6 KiB
Go
54 lines
1.6 KiB
Go
// Copyright 2017 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package internal
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"google.golang.org/api/googleapi"
|
|
"google.golang.org/grpc/status"
|
|
)
|
|
|
|
// Annotate prepends msg to the error message in err, attempting
|
|
// to preserve other information in err, like an error code.
|
|
//
|
|
// Annotate panics if err is nil.
|
|
//
|
|
// Annotate knows about these error types:
|
|
// - "google.golang.org/grpc/status".Status
|
|
// - "google.golang.org/api/googleapi".Error
|
|
// If the error is not one of these types, Annotate behaves
|
|
// like
|
|
// fmt.Errorf("%s: %v", msg, err)
|
|
func Annotate(err error, msg string) error {
|
|
if err == nil {
|
|
panic("Annotate called with nil")
|
|
}
|
|
if s, ok := status.FromError(err); ok {
|
|
p := s.Proto()
|
|
p.Message = msg + ": " + p.Message
|
|
return status.ErrorProto(p)
|
|
}
|
|
if g, ok := err.(*googleapi.Error); ok {
|
|
g.Message = msg + ": " + g.Message
|
|
return g
|
|
}
|
|
return fmt.Errorf("%s: %v", msg, err)
|
|
}
|
|
|
|
// Annotatef uses format and args to format a string, then calls Annotate.
|
|
func Annotatef(err error, format string, args ...interface{}) error {
|
|
return Annotate(err, fmt.Sprintf(format, args...))
|
|
}
|