From 15b82a15d235535f8716a0861b4b63fc409a329e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Tue, 8 Oct 2019 16:07:51 +0200 Subject: [PATCH] osbuild-composer: Rename module to github.com/osbuild/osbuild-composer This should be the best practice according to other popular go projects: - https://github.com/prometheus/prometheus - https://github.com/syncthing/syncthing - https://github.com/drone/drone - https://github.com/hashicorp/terraform Also, this change fixes go get command (it currently fails due to bad package name). --- cmd/osbuild-composer/main.go | 8 ++++---- cmd/osbuild-worker/job.go | 4 ++-- go.mod | 2 +- internal/blueprint/ami_output.go | 2 +- internal/blueprint/blueprint.go | 2 +- internal/blueprint/disk_output.go | 2 +- internal/blueprint/ext4_output.go | 2 +- internal/blueprint/liveiso_output.go | 2 +- internal/blueprint/openstack_output.go | 2 +- internal/blueprint/qcow2_output.go | 2 +- internal/blueprint/tar_output.go | 2 +- internal/blueprint/vhd_output.go | 2 +- internal/blueprint/vmdk_output.go | 2 +- internal/jobqueue/api.go | 6 +++--- internal/jobqueue/api_test.go | 6 +++--- internal/store/store.go | 6 +++--- internal/weldr/api.go | 10 +++++----- internal/weldr/api_test.go | 6 +++--- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/cmd/osbuild-composer/main.go b/cmd/osbuild-composer/main.go index 419be5db1..bdf363ac6 100644 --- a/cmd/osbuild-composer/main.go +++ b/cmd/osbuild-composer/main.go @@ -5,10 +5,10 @@ import ( "log" "os" - "osbuild-composer/internal/jobqueue" - "osbuild-composer/internal/rpmmd" - "osbuild-composer/internal/store" - "osbuild-composer/internal/weldr" + "github.com/osbuild/osbuild-composer/internal/jobqueue" + "github.com/osbuild/osbuild-composer/internal/rpmmd" + "github.com/osbuild/osbuild-composer/internal/store" + "github.com/osbuild/osbuild-composer/internal/weldr" "github.com/coreos/go-systemd/activation" ) diff --git a/cmd/osbuild-worker/job.go b/cmd/osbuild-worker/job.go index fbde2e9b3..15757c6a4 100644 --- a/cmd/osbuild-worker/job.go +++ b/cmd/osbuild-worker/job.go @@ -7,8 +7,8 @@ import ( "github.com/google/uuid" - "osbuild-composer/internal/pipeline" - "osbuild-composer/internal/target" + "github.com/osbuild/osbuild-composer/internal/pipeline" + "github.com/osbuild/osbuild-composer/internal/target" ) type Job struct { diff --git a/go.mod b/go.mod index a0963f3e5..82b1e46f4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module osbuild-composer +module github.com/osbuild/osbuild-composer go 1.12 diff --git a/internal/blueprint/ami_output.go b/internal/blueprint/ami_output.go index 619f26065..2402079af 100644 --- a/internal/blueprint/ami_output.go +++ b/internal/blueprint/ami_output.go @@ -1,6 +1,6 @@ package blueprint -import "osbuild-composer/internal/pipeline" +import "github.com/osbuild/osbuild-composer/internal/pipeline" type amiOutput struct{} diff --git a/internal/blueprint/blueprint.go b/internal/blueprint/blueprint.go index af98b2a44..bd12bcab6 100644 --- a/internal/blueprint/blueprint.go +++ b/internal/blueprint/blueprint.go @@ -3,7 +3,7 @@ package blueprint import ( - "osbuild-composer/internal/pipeline" + "github.com/osbuild/osbuild-composer/internal/pipeline" "sort" ) diff --git a/internal/blueprint/disk_output.go b/internal/blueprint/disk_output.go index c52ac9197..a1bb9f45c 100644 --- a/internal/blueprint/disk_output.go +++ b/internal/blueprint/disk_output.go @@ -1,6 +1,6 @@ package blueprint -import "osbuild-composer/internal/pipeline" +import "github.com/osbuild/osbuild-composer/internal/pipeline" type diskOutput struct{} diff --git a/internal/blueprint/ext4_output.go b/internal/blueprint/ext4_output.go index 3b2a89beb..d3c0a095a 100644 --- a/internal/blueprint/ext4_output.go +++ b/internal/blueprint/ext4_output.go @@ -1,6 +1,6 @@ package blueprint -import "osbuild-composer/internal/pipeline" +import "github.com/osbuild/osbuild-composer/internal/pipeline" type ext4Output struct{} diff --git a/internal/blueprint/liveiso_output.go b/internal/blueprint/liveiso_output.go index bde3966bc..0bfd7328d 100644 --- a/internal/blueprint/liveiso_output.go +++ b/internal/blueprint/liveiso_output.go @@ -1,6 +1,6 @@ package blueprint -import "osbuild-composer/internal/pipeline" +import "github.com/osbuild/osbuild-composer/internal/pipeline" type liveIsoOutput struct{} diff --git a/internal/blueprint/openstack_output.go b/internal/blueprint/openstack_output.go index c8775c7a4..c400ac1a1 100644 --- a/internal/blueprint/openstack_output.go +++ b/internal/blueprint/openstack_output.go @@ -1,6 +1,6 @@ package blueprint -import "osbuild-composer/internal/pipeline" +import "github.com/osbuild/osbuild-composer/internal/pipeline" type openstackOutput struct{} diff --git a/internal/blueprint/qcow2_output.go b/internal/blueprint/qcow2_output.go index 524b40357..e03f2cc42 100644 --- a/internal/blueprint/qcow2_output.go +++ b/internal/blueprint/qcow2_output.go @@ -1,6 +1,6 @@ package blueprint -import "osbuild-composer/internal/pipeline" +import "github.com/osbuild/osbuild-composer/internal/pipeline" type qcow2Output struct{} diff --git a/internal/blueprint/tar_output.go b/internal/blueprint/tar_output.go index 5b6295cde..f5ffb8e5f 100644 --- a/internal/blueprint/tar_output.go +++ b/internal/blueprint/tar_output.go @@ -1,6 +1,6 @@ package blueprint -import "osbuild-composer/internal/pipeline" +import "github.com/osbuild/osbuild-composer/internal/pipeline" type tarOutput struct{} diff --git a/internal/blueprint/vhd_output.go b/internal/blueprint/vhd_output.go index 808b94ae5..a0458f3ab 100644 --- a/internal/blueprint/vhd_output.go +++ b/internal/blueprint/vhd_output.go @@ -1,6 +1,6 @@ package blueprint -import "osbuild-composer/internal/pipeline" +import "github.com/osbuild/osbuild-composer/internal/pipeline" type vhdOutput struct{} diff --git a/internal/blueprint/vmdk_output.go b/internal/blueprint/vmdk_output.go index 738e25c53..e2502f7d6 100644 --- a/internal/blueprint/vmdk_output.go +++ b/internal/blueprint/vmdk_output.go @@ -1,6 +1,6 @@ package blueprint -import "osbuild-composer/internal/pipeline" +import "github.com/osbuild/osbuild-composer/internal/pipeline" type vmdkOutput struct{} diff --git a/internal/jobqueue/api.go b/internal/jobqueue/api.go index 2977d69f0..bfaa4f1e0 100644 --- a/internal/jobqueue/api.go +++ b/internal/jobqueue/api.go @@ -2,12 +2,12 @@ package jobqueue import ( "encoding/json" + "github.com/osbuild/osbuild-composer/internal/pipeline" + "github.com/osbuild/osbuild-composer/internal/store" + "github.com/osbuild/osbuild-composer/internal/target" "log" "net" "net/http" - "osbuild-composer/internal/pipeline" - "osbuild-composer/internal/store" - "osbuild-composer/internal/target" "github.com/google/uuid" "github.com/julienschmidt/httprouter" diff --git a/internal/jobqueue/api_test.go b/internal/jobqueue/api_test.go index 4cd159d9c..a5a486af5 100644 --- a/internal/jobqueue/api_test.go +++ b/internal/jobqueue/api_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "osbuild-composer/internal/blueprint" - "osbuild-composer/internal/jobqueue" - "osbuild-composer/internal/store" + "github.com/osbuild/osbuild-composer/internal/blueprint" + "github.com/osbuild/osbuild-composer/internal/jobqueue" + "github.com/osbuild/osbuild-composer/internal/store" "github.com/google/uuid" ) diff --git a/internal/store/store.go b/internal/store/store.go index 25d87206f..94d02c7ea 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -4,12 +4,12 @@ package store import ( "encoding/json" + "github.com/osbuild/osbuild-composer/internal/blueprint" + "github.com/osbuild/osbuild-composer/internal/pipeline" + "github.com/osbuild/osbuild-composer/internal/target" "io/ioutil" "log" "os" - "osbuild-composer/internal/blueprint" - "osbuild-composer/internal/pipeline" - "osbuild-composer/internal/target" "path/filepath" "sort" "sync" diff --git a/internal/weldr/api.go b/internal/weldr/api.go index 7fd7e9af7..afec0a695 100644 --- a/internal/weldr/api.go +++ b/internal/weldr/api.go @@ -13,9 +13,9 @@ import ( "github.com/google/uuid" "github.com/julienschmidt/httprouter" - "osbuild-composer/internal/blueprint" - "osbuild-composer/internal/rpmmd" - "osbuild-composer/internal/store" + "github.com/osbuild/osbuild-composer/internal/blueprint" + "github.com/osbuild/osbuild-composer/internal/rpmmd" + "github.com/osbuild/osbuild-composer/internal/store" ) type API struct { @@ -681,8 +681,8 @@ func (api *API) composeStatusHandler(writer http.ResponseWriter, request *http.R id, err := uuid.Parse(uuidString) if err != nil { statusResponseError(writer, http.StatusBadRequest, "invalid UUID") - return - } + return + } uuids = append(uuids, id) } reply.UUIDs = api.store.ListQueue(uuids) diff --git a/internal/weldr/api_test.go b/internal/weldr/api_test.go index 70717803e..f29a0917a 100644 --- a/internal/weldr/api_test.go +++ b/internal/weldr/api_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "osbuild-composer/internal/rpmmd" - "osbuild-composer/internal/store" - "osbuild-composer/internal/weldr" + "github.com/osbuild/osbuild-composer/internal/rpmmd" + "github.com/osbuild/osbuild-composer/internal/store" + "github.com/osbuild/osbuild-composer/internal/weldr" ) var repo = rpmmd.RepoConfig{