From 075373a51eaab359aef875220af2ea3ce77fd055 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Tue, 9 Mar 2021 10:53:54 +0100 Subject: [PATCH] internal: Move GCP library to internal/cloud The internal GCP library was originally placed into `internal/upload` directory, since its purpose was mainly to upload and import built images to GCP. Functionality for other cloud-provider-specific libraries is broader, however scattered around the `internal/` directory based on purpose (e.g. in `internal/boot` and `internal/upload`). Since all parts of provider-specific library usually share some common pieces (e.g. authentication), it makes sense to consolidate them into a single package (e.g. in `internal/cloud/`). Create `internal/cloud` directory, where all cloud-provider-specific internal libraries should be consolidated. Start with GCP. Signed-off-by: Tomas Hozza --- cmd/osbuild-upload-gcp/main.go | 2 +- cmd/osbuild-worker/jobimpl-osbuild.go | 2 +- internal/{upload => cloud}/gcp/gcp.go | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename internal/{upload => cloud}/gcp/gcp.go (100%) diff --git a/cmd/osbuild-upload-gcp/main.go b/cmd/osbuild-upload-gcp/main.go index 0ef9d9b90..89da016d7 100644 --- a/cmd/osbuild-upload-gcp/main.go +++ b/cmd/osbuild-upload-gcp/main.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "log" - "github.com/osbuild/osbuild-composer/internal/upload/gcp" + "github.com/osbuild/osbuild-composer/internal/cloud/gcp" ) type strArrayFlag []string diff --git a/cmd/osbuild-worker/jobimpl-osbuild.go b/cmd/osbuild-worker/jobimpl-osbuild.go index 4ff567905..3a332f80b 100644 --- a/cmd/osbuild-worker/jobimpl-osbuild.go +++ b/cmd/osbuild-worker/jobimpl-osbuild.go @@ -16,13 +16,13 @@ import ( "github.com/google/uuid" + "github.com/osbuild/osbuild-composer/internal/cloud/gcp" "github.com/osbuild/osbuild-composer/internal/common" "github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/osbuild" "github.com/osbuild/osbuild-composer/internal/target" "github.com/osbuild/osbuild-composer/internal/upload/awsupload" "github.com/osbuild/osbuild-composer/internal/upload/azure" - "github.com/osbuild/osbuild-composer/internal/upload/gcp" "github.com/osbuild/osbuild-composer/internal/upload/koji" "github.com/osbuild/osbuild-composer/internal/upload/vmware" "github.com/osbuild/osbuild-composer/internal/worker" diff --git a/internal/upload/gcp/gcp.go b/internal/cloud/gcp/gcp.go similarity index 100% rename from internal/upload/gcp/gcp.go rename to internal/cloud/gcp/gcp.go