From 8090621300ad9a8929dfa9a511de6cc8594feba3 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Fri, 12 Feb 2021 13:18:15 +0100 Subject: [PATCH] osbuild: rename package to osbuild1 Preparing for version 2 of the manifest schema, which will be implemented in a separate package (osbuild2) alongside the original. --- cmd/osbuild-worker/jobimpl-osbuild.go | 2 +- cmd/osbuild-worker/main_test.go | 2 +- cmd/osbuild-worker/osbuild.go | 2 +- internal/disk/disk.go | 2 +- internal/distro/fedora32/distro.go | 2 +- internal/distro/fedora33/distro.go | 2 +- internal/distro/fedoratest/distro.go | 2 +- internal/distro/rhel8/distro.go | 2 +- internal/distro/rhel84/distro.go | 2 +- internal/distro/test_distro/distro.go | 2 +- internal/kojiapi/server_test.go | 2 +- internal/{osbuild => osbuild1}/assembler.go | 2 +- internal/{osbuild => osbuild1}/assembler_test.go | 2 +- internal/{osbuild => osbuild1}/chrony_stage.go | 2 +- internal/{osbuild => osbuild1}/chrony_stage_test.go | 2 +- internal/{osbuild => osbuild1}/files_source.go | 2 +- internal/{osbuild => osbuild1}/firewall_stage.go | 2 +- internal/{osbuild => osbuild1}/firewall_stage_test.go | 2 +- internal/{osbuild => osbuild1}/first_boot_stage.go | 2 +- internal/{osbuild => osbuild1}/first_boot_stage_test.go | 2 +- internal/{osbuild => osbuild1}/fix_bls_stage.go | 2 +- internal/{osbuild => osbuild1}/fix_bls_stage_test.go | 2 +- internal/{osbuild => osbuild1}/fstab_stage.go | 2 +- internal/{osbuild => osbuild1}/fstab_stage_test.go | 2 +- internal/{osbuild => osbuild1}/groups_stage.go | 2 +- internal/{osbuild => osbuild1}/groups_stage_test.go | 2 +- internal/{osbuild => osbuild1}/grub2_stage.go | 2 +- internal/{osbuild => osbuild1}/grub2_stage_test.go | 2 +- internal/{osbuild => osbuild1}/hostname_stage.go | 2 +- internal/{osbuild => osbuild1}/hostname_stage_test.go | 2 +- internal/{osbuild => osbuild1}/kernel_cmdline_stage.go | 2 +- internal/{osbuild => osbuild1}/kernel_cmdline_stage_test.go | 2 +- internal/{osbuild => osbuild1}/keymap_stage.go | 2 +- internal/{osbuild => osbuild1}/keymap_stage_test.go | 2 +- internal/{osbuild => osbuild1}/locale_stage.go | 2 +- internal/{osbuild => osbuild1}/locale_stage_test.go | 2 +- internal/{osbuild => osbuild1}/osbuild.go | 4 ++-- internal/{osbuild => osbuild1}/osbuild_test.go | 2 +- internal/{osbuild => osbuild1}/ostree_commit_assembler.go | 2 +- internal/{osbuild => osbuild1}/qemu_assembler.go | 2 +- internal/{osbuild => osbuild1}/rawfs_assembler.go | 2 +- internal/{osbuild => osbuild1}/result.go | 2 +- internal/{osbuild => osbuild1}/result_test.go | 2 +- internal/{osbuild => osbuild1}/rhsm_stage.go | 2 +- internal/{osbuild => osbuild1}/rhsm_stage_test.go | 2 +- internal/{osbuild => osbuild1}/rpm_ostree_stage.go | 2 +- internal/{osbuild => osbuild1}/rpm_stage.go | 2 +- internal/{osbuild => osbuild1}/rpm_stage_test.go | 2 +- internal/{osbuild => osbuild1}/script_stage.go | 2 +- internal/{osbuild => osbuild1}/script_stage_test.go | 2 +- internal/{osbuild => osbuild1}/selinux_stage.go | 2 +- internal/{osbuild => osbuild1}/selinux_stage_test.go | 2 +- internal/{osbuild => osbuild1}/source.go | 2 +- internal/{osbuild => osbuild1}/source_test.go | 2 +- internal/{osbuild => osbuild1}/stage.go | 2 +- internal/{osbuild => osbuild1}/stage_test.go | 2 +- internal/{osbuild => osbuild1}/sysconfig_stage.go | 2 +- internal/{osbuild => osbuild1}/sysconfig_stage_test.go | 2 +- internal/{osbuild => osbuild1}/systemd_stage.go | 2 +- internal/{osbuild => osbuild1}/systemd_stage_test.go | 2 +- internal/{osbuild => osbuild1}/tar_assembler.go | 2 +- internal/{osbuild => osbuild1}/timezone_stage.go | 2 +- internal/{osbuild => osbuild1}/timezone_stage_test.go | 2 +- internal/{osbuild => osbuild1}/users_stage.go | 2 +- internal/{osbuild => osbuild1}/users_stage_test.go | 2 +- internal/{osbuild => osbuild1}/zipl_stage.go | 2 +- internal/{osbuild => osbuild1}/zipl_stage_test.go | 2 +- internal/store/store_test.go | 2 +- internal/weldr/api.go | 2 +- internal/worker/json.go | 2 +- 70 files changed, 71 insertions(+), 71 deletions(-) rename internal/{osbuild => osbuild1}/assembler.go (98%) rename internal/{osbuild => osbuild1}/assembler_test.go (99%) rename internal/{osbuild => osbuild1}/chrony_stage.go (93%) rename internal/{osbuild => osbuild1}/chrony_stage_test.go (94%) rename internal/{osbuild => osbuild1}/files_source.go (95%) rename internal/{osbuild => osbuild1}/firewall_stage.go (95%) rename internal/{osbuild => osbuild1}/firewall_stage_test.go (94%) rename internal/{osbuild => osbuild1}/first_boot_stage.go (95%) rename internal/{osbuild => osbuild1}/first_boot_stage_test.go (94%) rename internal/{osbuild => osbuild1}/fix_bls_stage.go (97%) rename internal/{osbuild => osbuild1}/fix_bls_stage_test.go (94%) rename internal/{osbuild => osbuild1}/fstab_stage.go (98%) rename internal/{osbuild => osbuild1}/fstab_stage_test.go (98%) rename internal/{osbuild => osbuild1}/groups_stage.go (95%) rename internal/{osbuild => osbuild1}/groups_stage_test.go (94%) rename internal/{osbuild => osbuild1}/grub2_stage.go (98%) rename internal/{osbuild => osbuild1}/grub2_stage_test.go (94%) rename internal/{osbuild => osbuild1}/hostname_stage.go (93%) rename internal/{osbuild => osbuild1}/hostname_stage_test.go (94%) rename internal/{osbuild => osbuild1}/kernel_cmdline_stage.go (97%) rename internal/{osbuild => osbuild1}/kernel_cmdline_stage_test.go (95%) rename internal/{osbuild => osbuild1}/keymap_stage.go (93%) rename internal/{osbuild => osbuild1}/keymap_stage_test.go (94%) rename internal/{osbuild => osbuild1}/locale_stage.go (96%) rename internal/{osbuild => osbuild1}/locale_stage_test.go (94%) rename internal/{osbuild => osbuild1}/osbuild.go (96%) rename internal/{osbuild => osbuild1}/osbuild_test.go (98%) rename internal/{osbuild => osbuild1}/ostree_commit_assembler.go (97%) rename internal/{osbuild => osbuild1}/qemu_assembler.go (98%) rename internal/{osbuild => osbuild1}/rawfs_assembler.go (97%) rename internal/{osbuild => osbuild1}/result.go (99%) rename internal/{osbuild => osbuild1}/result_test.go (99%) rename internal/{osbuild => osbuild1}/rhsm_stage.go (98%) rename internal/{osbuild => osbuild1}/rhsm_stage_test.go (94%) rename internal/{osbuild => osbuild1}/rpm_ostree_stage.go (96%) rename internal/{osbuild => osbuild1}/rpm_stage.go (98%) rename internal/{osbuild => osbuild1}/rpm_stage_test.go (94%) rename internal/{osbuild => osbuild1}/script_stage.go (97%) rename internal/{osbuild => osbuild1}/script_stage_test.go (96%) rename internal/{osbuild => osbuild1}/selinux_stage.go (97%) rename internal/{osbuild => osbuild1}/selinux_stage_test.go (97%) rename internal/{osbuild => osbuild1}/source.go (98%) rename internal/{osbuild => osbuild1}/source_test.go (99%) rename internal/{osbuild => osbuild1}/stage.go (99%) rename internal/{osbuild => osbuild1}/stage_test.go (99%) rename internal/{osbuild => osbuild1}/sysconfig_stage.go (97%) rename internal/{osbuild => osbuild1}/sysconfig_stage_test.go (94%) rename internal/{osbuild => osbuild1}/systemd_stage.go (96%) rename internal/{osbuild => osbuild1}/systemd_stage_test.go (94%) rename internal/{osbuild => osbuild1}/tar_assembler.go (97%) rename internal/{osbuild => osbuild1}/timezone_stage.go (93%) rename internal/{osbuild => osbuild1}/timezone_stage_test.go (94%) rename internal/{osbuild => osbuild1}/users_stage.go (97%) rename internal/{osbuild => osbuild1}/users_stage_test.go (94%) rename internal/{osbuild => osbuild1}/zipl_stage.go (97%) rename internal/{osbuild => osbuild1}/zipl_stage_test.go (96%) diff --git a/cmd/osbuild-worker/jobimpl-osbuild.go b/cmd/osbuild-worker/jobimpl-osbuild.go index 5da559494..0bae9280c 100644 --- a/cmd/osbuild-worker/jobimpl-osbuild.go +++ b/cmd/osbuild-worker/jobimpl-osbuild.go @@ -19,7 +19,7 @@ import ( "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" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/osbuild/osbuild-composer/internal/target" "github.com/osbuild/osbuild-composer/internal/upload/awsupload" "github.com/osbuild/osbuild-composer/internal/upload/azure" diff --git a/cmd/osbuild-worker/main_test.go b/cmd/osbuild-worker/main_test.go index de21571f7..3d7ee1508 100644 --- a/cmd/osbuild-worker/main_test.go +++ b/cmd/osbuild-worker/main_test.go @@ -2,7 +2,7 @@ package main import ( "encoding/json" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/osbuild/osbuild-composer/internal/upload/koji" "github.com/stretchr/testify/require" "testing" diff --git a/cmd/osbuild-worker/osbuild.go b/cmd/osbuild-worker/osbuild.go index eb64beb91..780fda30f 100644 --- a/cmd/osbuild-worker/osbuild.go +++ b/cmd/osbuild-worker/osbuild.go @@ -8,7 +8,7 @@ import ( "os/exec" "github.com/osbuild/osbuild-composer/internal/distro" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" ) // Run an instance of osbuild, returning a parsed osbuild.Result. diff --git a/internal/disk/disk.go b/internal/disk/disk.go index 4ab248430..8bacfd964 100644 --- a/internal/disk/disk.go +++ b/internal/disk/disk.go @@ -7,7 +7,7 @@ package disk import ( "sort" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" ) type PartitionTable struct { diff --git a/internal/distro/fedora32/distro.go b/internal/distro/fedora32/distro.go index e3d0dee08..2096f5cbd 100644 --- a/internal/distro/fedora32/distro.go +++ b/internal/distro/fedora32/distro.go @@ -7,7 +7,7 @@ import ( "sort" "github.com/osbuild/osbuild-composer/internal/distro" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/google/uuid" diff --git a/internal/distro/fedora33/distro.go b/internal/distro/fedora33/distro.go index ca85bbf20..902611c91 100644 --- a/internal/distro/fedora33/distro.go +++ b/internal/distro/fedora33/distro.go @@ -7,7 +7,7 @@ import ( "sort" "github.com/osbuild/osbuild-composer/internal/distro" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/google/uuid" diff --git a/internal/distro/fedoratest/distro.go b/internal/distro/fedoratest/distro.go index 1a22101e6..4fc28a130 100644 --- a/internal/distro/fedoratest/distro.go +++ b/internal/distro/fedoratest/distro.go @@ -6,7 +6,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/blueprint" "github.com/osbuild/osbuild-composer/internal/distro" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/osbuild/osbuild-composer/internal/rpmmd" ) diff --git a/internal/distro/rhel8/distro.go b/internal/distro/rhel8/distro.go index 7c7e8d4af..a4fd0b037 100644 --- a/internal/distro/rhel8/distro.go +++ b/internal/distro/rhel8/distro.go @@ -7,7 +7,7 @@ import ( "sort" "github.com/osbuild/osbuild-composer/internal/distro" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/google/uuid" diff --git a/internal/distro/rhel84/distro.go b/internal/distro/rhel84/distro.go index e13582af9..41b4519e4 100644 --- a/internal/distro/rhel84/distro.go +++ b/internal/distro/rhel84/distro.go @@ -10,7 +10,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/disk" "github.com/osbuild/osbuild-composer/internal/distro" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/google/uuid" diff --git a/internal/distro/test_distro/distro.go b/internal/distro/test_distro/distro.go index c6b9348c9..0586edd7b 100644 --- a/internal/distro/test_distro/distro.go +++ b/internal/distro/test_distro/distro.go @@ -6,7 +6,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/blueprint" "github.com/osbuild/osbuild-composer/internal/distro" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/osbuild/osbuild-composer/internal/rpmmd" ) diff --git a/internal/kojiapi/server_test.go b/internal/kojiapi/server_test.go index bfeae4e8f..e2b10f02f 100644 --- a/internal/kojiapi/server_test.go +++ b/internal/kojiapi/server_test.go @@ -18,7 +18,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/kojiapi/api" distro_mock "github.com/osbuild/osbuild-composer/internal/mocks/distro" rpmmd_mock "github.com/osbuild/osbuild-composer/internal/mocks/rpmmd" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/osbuild/osbuild-composer/internal/test" "github.com/osbuild/osbuild-composer/internal/worker" "github.com/stretchr/testify/require" diff --git a/internal/osbuild/assembler.go b/internal/osbuild1/assembler.go similarity index 98% rename from internal/osbuild/assembler.go rename to internal/osbuild1/assembler.go index 354766889..f6a6fa357 100644 --- a/internal/osbuild/assembler.go +++ b/internal/osbuild1/assembler.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "encoding/json" diff --git a/internal/osbuild/assembler_test.go b/internal/osbuild1/assembler_test.go similarity index 99% rename from internal/osbuild/assembler_test.go rename to internal/osbuild1/assembler_test.go index 644420cbb..2f4b58227 100644 --- a/internal/osbuild/assembler_test.go +++ b/internal/osbuild1/assembler_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "encoding/json" diff --git a/internal/osbuild/chrony_stage.go b/internal/osbuild1/chrony_stage.go similarity index 93% rename from internal/osbuild/chrony_stage.go rename to internal/osbuild1/chrony_stage.go index 1be51c2dc..a07ffa5fb 100644 --- a/internal/osbuild/chrony_stage.go +++ b/internal/osbuild1/chrony_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type ChronyStageOptions struct { Timeservers []string `json:"timeservers"` diff --git a/internal/osbuild/chrony_stage_test.go b/internal/osbuild1/chrony_stage_test.go similarity index 94% rename from internal/osbuild/chrony_stage_test.go rename to internal/osbuild1/chrony_stage_test.go index df3050f47..a62a3b9fd 100644 --- a/internal/osbuild/chrony_stage_test.go +++ b/internal/osbuild1/chrony_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/files_source.go b/internal/osbuild1/files_source.go similarity index 95% rename from internal/osbuild/files_source.go rename to internal/osbuild1/files_source.go index 43b8307a9..2cd43932f 100644 --- a/internal/osbuild/files_source.go +++ b/internal/osbuild1/files_source.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type Secret struct { Name string `json:"name,omitempty"` diff --git a/internal/osbuild/firewall_stage.go b/internal/osbuild1/firewall_stage.go similarity index 95% rename from internal/osbuild/firewall_stage.go rename to internal/osbuild1/firewall_stage.go index fd74fb150..259c59891 100644 --- a/internal/osbuild/firewall_stage.go +++ b/internal/osbuild1/firewall_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type FirewallStageOptions struct { Ports []string `json:"ports,omitempty"` diff --git a/internal/osbuild/firewall_stage_test.go b/internal/osbuild1/firewall_stage_test.go similarity index 94% rename from internal/osbuild/firewall_stage_test.go rename to internal/osbuild1/firewall_stage_test.go index 14e1d92b5..6bb587812 100644 --- a/internal/osbuild/firewall_stage_test.go +++ b/internal/osbuild1/firewall_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/first_boot_stage.go b/internal/osbuild1/first_boot_stage.go similarity index 95% rename from internal/osbuild/first_boot_stage.go rename to internal/osbuild1/first_boot_stage.go index 6009fe3b0..b5269c233 100644 --- a/internal/osbuild/first_boot_stage.go +++ b/internal/osbuild1/first_boot_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type FirstBootStageOptions struct { Commands []string `json:"commands"` diff --git a/internal/osbuild/first_boot_stage_test.go b/internal/osbuild1/first_boot_stage_test.go similarity index 94% rename from internal/osbuild/first_boot_stage_test.go rename to internal/osbuild1/first_boot_stage_test.go index f6451fae7..a85a33088 100644 --- a/internal/osbuild/first_boot_stage_test.go +++ b/internal/osbuild1/first_boot_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/fix_bls_stage.go b/internal/osbuild1/fix_bls_stage.go similarity index 97% rename from internal/osbuild/fix_bls_stage.go rename to internal/osbuild1/fix_bls_stage.go index b96074c6b..ab87364d9 100644 --- a/internal/osbuild/fix_bls_stage.go +++ b/internal/osbuild1/fix_bls_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // A FixBLSStageOptions struct is empty, as the stage takes no options. // diff --git a/internal/osbuild/fix_bls_stage_test.go b/internal/osbuild1/fix_bls_stage_test.go similarity index 94% rename from internal/osbuild/fix_bls_stage_test.go rename to internal/osbuild1/fix_bls_stage_test.go index 4d6349b7e..6efd07aa8 100644 --- a/internal/osbuild/fix_bls_stage_test.go +++ b/internal/osbuild1/fix_bls_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/fstab_stage.go b/internal/osbuild1/fstab_stage.go similarity index 98% rename from internal/osbuild/fstab_stage.go rename to internal/osbuild1/fstab_stage.go index 4bf679218..5c1176cb8 100644 --- a/internal/osbuild/fstab_stage.go +++ b/internal/osbuild1/fstab_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // The FSTabStageOptions describe the content of the /etc/fstab file. // diff --git a/internal/osbuild/fstab_stage_test.go b/internal/osbuild1/fstab_stage_test.go similarity index 98% rename from internal/osbuild/fstab_stage_test.go rename to internal/osbuild1/fstab_stage_test.go index 049f7525b..1c286ef4c 100644 --- a/internal/osbuild/fstab_stage_test.go +++ b/internal/osbuild1/fstab_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/groups_stage.go b/internal/osbuild1/groups_stage.go similarity index 95% rename from internal/osbuild/groups_stage.go rename to internal/osbuild1/groups_stage.go index 9c778fc62..3575a73a1 100644 --- a/internal/osbuild/groups_stage.go +++ b/internal/osbuild1/groups_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type GroupsStageOptions struct { Groups map[string]GroupsStageOptionsGroup `json:"groups"` diff --git a/internal/osbuild/groups_stage_test.go b/internal/osbuild1/groups_stage_test.go similarity index 94% rename from internal/osbuild/groups_stage_test.go rename to internal/osbuild1/groups_stage_test.go index a8b3ff633..6b71f4b97 100644 --- a/internal/osbuild/groups_stage_test.go +++ b/internal/osbuild1/groups_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/grub2_stage.go b/internal/osbuild1/grub2_stage.go similarity index 98% rename from internal/osbuild/grub2_stage.go rename to internal/osbuild1/grub2_stage.go index 1998b519e..3662d5758 100644 --- a/internal/osbuild/grub2_stage.go +++ b/internal/osbuild1/grub2_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import "github.com/google/uuid" diff --git a/internal/osbuild/grub2_stage_test.go b/internal/osbuild1/grub2_stage_test.go similarity index 94% rename from internal/osbuild/grub2_stage_test.go rename to internal/osbuild1/grub2_stage_test.go index 6dca7e1c1..dc4022a22 100644 --- a/internal/osbuild/grub2_stage_test.go +++ b/internal/osbuild1/grub2_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/hostname_stage.go b/internal/osbuild1/hostname_stage.go similarity index 93% rename from internal/osbuild/hostname_stage.go rename to internal/osbuild1/hostname_stage.go index 71d7a44a4..4c835f3c0 100644 --- a/internal/osbuild/hostname_stage.go +++ b/internal/osbuild1/hostname_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type HostnameStageOptions struct { Hostname string `json:"hostname"` diff --git a/internal/osbuild/hostname_stage_test.go b/internal/osbuild1/hostname_stage_test.go similarity index 94% rename from internal/osbuild/hostname_stage_test.go rename to internal/osbuild1/hostname_stage_test.go index efa1684fd..c8a05aa4a 100644 --- a/internal/osbuild/hostname_stage_test.go +++ b/internal/osbuild1/hostname_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/kernel_cmdline_stage.go b/internal/osbuild1/kernel_cmdline_stage.go similarity index 97% rename from internal/osbuild/kernel_cmdline_stage.go rename to internal/osbuild1/kernel_cmdline_stage.go index 4e9a17832..d63d57638 100644 --- a/internal/osbuild/kernel_cmdline_stage.go +++ b/internal/osbuild1/kernel_cmdline_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // KernelCmdlineStageOptions describe how to create kernel-cmdline stage // diff --git a/internal/osbuild/kernel_cmdline_stage_test.go b/internal/osbuild1/kernel_cmdline_stage_test.go similarity index 95% rename from internal/osbuild/kernel_cmdline_stage_test.go rename to internal/osbuild1/kernel_cmdline_stage_test.go index 1a24c6302..705bd7d0e 100644 --- a/internal/osbuild/kernel_cmdline_stage_test.go +++ b/internal/osbuild1/kernel_cmdline_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/keymap_stage.go b/internal/osbuild1/keymap_stage.go similarity index 93% rename from internal/osbuild/keymap_stage.go rename to internal/osbuild1/keymap_stage.go index 9fd4fb700..7c213f0ab 100644 --- a/internal/osbuild/keymap_stage.go +++ b/internal/osbuild1/keymap_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type KeymapStageOptions struct { Keymap string `json:"keymap"` diff --git a/internal/osbuild/keymap_stage_test.go b/internal/osbuild1/keymap_stage_test.go similarity index 94% rename from internal/osbuild/keymap_stage_test.go rename to internal/osbuild1/keymap_stage_test.go index 76f61bfd1..4ee044402 100644 --- a/internal/osbuild/keymap_stage_test.go +++ b/internal/osbuild1/keymap_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/locale_stage.go b/internal/osbuild1/locale_stage.go similarity index 96% rename from internal/osbuild/locale_stage.go rename to internal/osbuild1/locale_stage.go index 8e6d3f488..f13600683 100644 --- a/internal/osbuild/locale_stage.go +++ b/internal/osbuild1/locale_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // The LocaleStageOptions describes the image's locale. // diff --git a/internal/osbuild/locale_stage_test.go b/internal/osbuild1/locale_stage_test.go similarity index 94% rename from internal/osbuild/locale_stage_test.go rename to internal/osbuild1/locale_stage_test.go index 5d3a6b9fc..79b7c85e5 100644 --- a/internal/osbuild/locale_stage_test.go +++ b/internal/osbuild1/locale_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/osbuild.go b/internal/osbuild1/osbuild.go similarity index 96% rename from internal/osbuild/osbuild.go rename to internal/osbuild1/osbuild.go index 760ea7b8c..b9b1978b2 100644 --- a/internal/osbuild/osbuild.go +++ b/internal/osbuild1/osbuild.go @@ -1,6 +1,6 @@ // Package osbuild provides primitives for representing and (un)marshalling -// OSBuild types. -package osbuild +// OSBuild (schema v1) types. +package osbuild1 // A Manifest represents an OSBuild source and pipeline manifest type Manifest struct { diff --git a/internal/osbuild/osbuild_test.go b/internal/osbuild1/osbuild_test.go similarity index 98% rename from internal/osbuild/osbuild_test.go rename to internal/osbuild1/osbuild_test.go index 2704c201e..01454648f 100644 --- a/internal/osbuild/osbuild_test.go +++ b/internal/osbuild1/osbuild_test.go @@ -1,6 +1,6 @@ // Package osbuild provides primitives for representing and (un)marshalling // OSBuild types. -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/ostree_commit_assembler.go b/internal/osbuild1/ostree_commit_assembler.go similarity index 97% rename from internal/osbuild/ostree_commit_assembler.go rename to internal/osbuild1/ostree_commit_assembler.go index eabb28b45..b9e18d355 100644 --- a/internal/osbuild/ostree_commit_assembler.go +++ b/internal/osbuild1/ostree_commit_assembler.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // OSTreeCommitAssemblerOptions desrcibe how to assemble a tree into an OSTree commit. type OSTreeCommitAssemblerOptions struct { diff --git a/internal/osbuild/qemu_assembler.go b/internal/osbuild1/qemu_assembler.go similarity index 98% rename from internal/osbuild/qemu_assembler.go rename to internal/osbuild1/qemu_assembler.go index 0e3292c04..b0a200df9 100644 --- a/internal/osbuild/qemu_assembler.go +++ b/internal/osbuild1/qemu_assembler.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // QEMUAssemblerOptions desrcibe how to assemble a tree into an image using qemu. // diff --git a/internal/osbuild/rawfs_assembler.go b/internal/osbuild1/rawfs_assembler.go similarity index 97% rename from internal/osbuild/rawfs_assembler.go rename to internal/osbuild1/rawfs_assembler.go index 3d8403866..af7832c86 100644 --- a/internal/osbuild/rawfs_assembler.go +++ b/internal/osbuild1/rawfs_assembler.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import "github.com/google/uuid" diff --git a/internal/osbuild/result.go b/internal/osbuild1/result.go similarity index 99% rename from internal/osbuild/result.go rename to internal/osbuild1/result.go index fe917983c..b7d51303f 100644 --- a/internal/osbuild/result.go +++ b/internal/osbuild1/result.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "encoding/json" diff --git a/internal/osbuild/result_test.go b/internal/osbuild1/result_test.go similarity index 99% rename from internal/osbuild/result_test.go rename to internal/osbuild1/result_test.go index b64da6e3c..872ba079b 100644 --- a/internal/osbuild/result_test.go +++ b/internal/osbuild1/result_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "bytes" diff --git a/internal/osbuild/rhsm_stage.go b/internal/osbuild1/rhsm_stage.go similarity index 98% rename from internal/osbuild/rhsm_stage.go rename to internal/osbuild1/rhsm_stage.go index 38f096d41..a0bb40f05 100644 --- a/internal/osbuild/rhsm_stage.go +++ b/internal/osbuild1/rhsm_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // RHSMStageOptions describes configuration of the RHSM stage. // diff --git a/internal/osbuild/rhsm_stage_test.go b/internal/osbuild1/rhsm_stage_test.go similarity index 94% rename from internal/osbuild/rhsm_stage_test.go rename to internal/osbuild1/rhsm_stage_test.go index 47b1a33aa..b63bd60a6 100644 --- a/internal/osbuild/rhsm_stage_test.go +++ b/internal/osbuild1/rhsm_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/rpm_ostree_stage.go b/internal/osbuild1/rpm_ostree_stage.go similarity index 96% rename from internal/osbuild/rpm_ostree_stage.go rename to internal/osbuild1/rpm_ostree_stage.go index b5a961441..f43984159 100644 --- a/internal/osbuild/rpm_ostree_stage.go +++ b/internal/osbuild1/rpm_ostree_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // The RPM-OSTree stage describes how to transform the imgae into an OSTree. type RPMOSTreeStageOptions struct { diff --git a/internal/osbuild/rpm_stage.go b/internal/osbuild1/rpm_stage.go similarity index 98% rename from internal/osbuild/rpm_stage.go rename to internal/osbuild1/rpm_stage.go index 0ed0a70af..f52c9d8ae 100644 --- a/internal/osbuild/rpm_stage.go +++ b/internal/osbuild1/rpm_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // The RPMStageOptions describe the operations of the RPM stage. // diff --git a/internal/osbuild/rpm_stage_test.go b/internal/osbuild1/rpm_stage_test.go similarity index 94% rename from internal/osbuild/rpm_stage_test.go rename to internal/osbuild1/rpm_stage_test.go index caa4e90cd..196b9b430 100644 --- a/internal/osbuild/rpm_stage_test.go +++ b/internal/osbuild1/rpm_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/script_stage.go b/internal/osbuild1/script_stage.go similarity index 97% rename from internal/osbuild/script_stage.go rename to internal/osbuild1/script_stage.go index 4d2bc766e..30274caa5 100644 --- a/internal/osbuild/script_stage.go +++ b/internal/osbuild1/script_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // The ScriptStageOptions specifies a custom script to run in the image type ScriptStageOptions struct { diff --git a/internal/osbuild/script_stage_test.go b/internal/osbuild1/script_stage_test.go similarity index 96% rename from internal/osbuild/script_stage_test.go rename to internal/osbuild1/script_stage_test.go index 1c181df7d..0470ec3c3 100644 --- a/internal/osbuild/script_stage_test.go +++ b/internal/osbuild1/script_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/selinux_stage.go b/internal/osbuild1/selinux_stage.go similarity index 97% rename from internal/osbuild/selinux_stage.go rename to internal/osbuild1/selinux_stage.go index 1e75812d3..c231eb993 100644 --- a/internal/osbuild/selinux_stage.go +++ b/internal/osbuild1/selinux_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // The SELinuxStageOptions describe how to apply selinux labels. // diff --git a/internal/osbuild/selinux_stage_test.go b/internal/osbuild1/selinux_stage_test.go similarity index 97% rename from internal/osbuild/selinux_stage_test.go rename to internal/osbuild1/selinux_stage_test.go index 9aaf56209..1bea8ad10 100644 --- a/internal/osbuild/selinux_stage_test.go +++ b/internal/osbuild1/selinux_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/source.go b/internal/osbuild1/source.go similarity index 98% rename from internal/osbuild/source.go rename to internal/osbuild1/source.go index ca763210a..c5d28c75f 100644 --- a/internal/osbuild/source.go +++ b/internal/osbuild1/source.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "encoding/json" diff --git a/internal/osbuild/source_test.go b/internal/osbuild1/source_test.go similarity index 99% rename from internal/osbuild/source_test.go rename to internal/osbuild1/source_test.go index 44306d4bb..105128adc 100644 --- a/internal/osbuild/source_test.go +++ b/internal/osbuild1/source_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "bytes" diff --git a/internal/osbuild/stage.go b/internal/osbuild1/stage.go similarity index 99% rename from internal/osbuild/stage.go rename to internal/osbuild1/stage.go index 4aeddad8a..c31182eee 100644 --- a/internal/osbuild/stage.go +++ b/internal/osbuild1/stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "encoding/json" diff --git a/internal/osbuild/stage_test.go b/internal/osbuild1/stage_test.go similarity index 99% rename from internal/osbuild/stage_test.go rename to internal/osbuild1/stage_test.go index 3753dd3d8..b2545548b 100644 --- a/internal/osbuild/stage_test.go +++ b/internal/osbuild1/stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "bytes" diff --git a/internal/osbuild/sysconfig_stage.go b/internal/osbuild1/sysconfig_stage.go similarity index 97% rename from internal/osbuild/sysconfig_stage.go rename to internal/osbuild1/sysconfig_stage.go index d083f7c45..f427b82e3 100644 --- a/internal/osbuild/sysconfig_stage.go +++ b/internal/osbuild1/sysconfig_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type SysconfigStageOptions struct { Kernel SysconfigKernelOptions `json:"kernel,omitempty"` diff --git a/internal/osbuild/sysconfig_stage_test.go b/internal/osbuild1/sysconfig_stage_test.go similarity index 94% rename from internal/osbuild/sysconfig_stage_test.go rename to internal/osbuild1/sysconfig_stage_test.go index b1c30b024..7ef0c840a 100644 --- a/internal/osbuild/sysconfig_stage_test.go +++ b/internal/osbuild1/sysconfig_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/systemd_stage.go b/internal/osbuild1/systemd_stage.go similarity index 96% rename from internal/osbuild/systemd_stage.go rename to internal/osbuild1/systemd_stage.go index b0c6043ee..8b29a6546 100644 --- a/internal/osbuild/systemd_stage.go +++ b/internal/osbuild1/systemd_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type SystemdStageOptions struct { EnabledServices []string `json:"enabled_services,omitempty"` diff --git a/internal/osbuild/systemd_stage_test.go b/internal/osbuild1/systemd_stage_test.go similarity index 94% rename from internal/osbuild/systemd_stage_test.go rename to internal/osbuild1/systemd_stage_test.go index 7d7fddbd0..f414aedae 100644 --- a/internal/osbuild/systemd_stage_test.go +++ b/internal/osbuild1/systemd_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/tar_assembler.go b/internal/osbuild1/tar_assembler.go similarity index 97% rename from internal/osbuild/tar_assembler.go rename to internal/osbuild1/tar_assembler.go index 527185dd0..a6f8a421e 100644 --- a/internal/osbuild/tar_assembler.go +++ b/internal/osbuild1/tar_assembler.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // TarAssemblerOptions desrcibe how to assemble a tree into a tar ball. // diff --git a/internal/osbuild/timezone_stage.go b/internal/osbuild1/timezone_stage.go similarity index 93% rename from internal/osbuild/timezone_stage.go rename to internal/osbuild1/timezone_stage.go index 130ac5f16..ba7c52811 100644 --- a/internal/osbuild/timezone_stage.go +++ b/internal/osbuild1/timezone_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type TimezoneStageOptions struct { Zone string `json:"zone"` diff --git a/internal/osbuild/timezone_stage_test.go b/internal/osbuild1/timezone_stage_test.go similarity index 94% rename from internal/osbuild/timezone_stage_test.go rename to internal/osbuild1/timezone_stage_test.go index 350705c21..23b665084 100644 --- a/internal/osbuild/timezone_stage_test.go +++ b/internal/osbuild1/timezone_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/users_stage.go b/internal/osbuild1/users_stage.go similarity index 97% rename from internal/osbuild/users_stage.go rename to internal/osbuild1/users_stage.go index 982915a3f..dff8c02c4 100644 --- a/internal/osbuild/users_stage.go +++ b/internal/osbuild1/users_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 type UsersStageOptions struct { Users map[string]UsersStageOptionsUser `json:"users"` diff --git a/internal/osbuild/users_stage_test.go b/internal/osbuild1/users_stage_test.go similarity index 94% rename from internal/osbuild/users_stage_test.go rename to internal/osbuild1/users_stage_test.go index 1b24b4774..5d64251da 100644 --- a/internal/osbuild/users_stage_test.go +++ b/internal/osbuild1/users_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/osbuild/zipl_stage.go b/internal/osbuild1/zipl_stage.go similarity index 97% rename from internal/osbuild/zipl_stage.go rename to internal/osbuild1/zipl_stage.go index 6b2f52f6b..e7cc2bfdf 100644 --- a/internal/osbuild/zipl_stage.go +++ b/internal/osbuild1/zipl_stage.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 // The ZiplStageOptions describe how to create zipl stage // diff --git a/internal/osbuild/zipl_stage_test.go b/internal/osbuild1/zipl_stage_test.go similarity index 96% rename from internal/osbuild/zipl_stage_test.go rename to internal/osbuild1/zipl_stage_test.go index 68bb0968a..959a88df6 100644 --- a/internal/osbuild/zipl_stage_test.go +++ b/internal/osbuild1/zipl_stage_test.go @@ -1,4 +1,4 @@ -package osbuild +package osbuild1 import ( "testing" diff --git a/internal/store/store_test.go b/internal/store/store_test.go index b836e1f93..7d13050d4 100644 --- a/internal/store/store_test.go +++ b/internal/store/store_test.go @@ -13,7 +13,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/common" "github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/distro/test_distro" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/osbuild/osbuild-composer/internal/rpmmd" "github.com/osbuild/osbuild-composer/internal/target" ) diff --git a/internal/weldr/api.go b/internal/weldr/api.go index 829e1868a..8a721c7e2 100644 --- a/internal/weldr/api.go +++ b/internal/weldr/api.go @@ -32,7 +32,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/common" "github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/jobqueue" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/osbuild/osbuild-composer/internal/rpmmd" "github.com/osbuild/osbuild-composer/internal/store" "github.com/osbuild/osbuild-composer/internal/target" diff --git a/internal/worker/json.go b/internal/worker/json.go index f015d1654..5b3f443de 100644 --- a/internal/worker/json.go +++ b/internal/worker/json.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" "github.com/osbuild/osbuild-composer/internal/distro" - "github.com/osbuild/osbuild-composer/internal/osbuild" + osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1" "github.com/osbuild/osbuild-composer/internal/target" )