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

@@ -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"

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"

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.

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 {

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"
 

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"
 

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"
 )
 

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"
 

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"
 

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"
 )
 

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"

internal/osbuild1/assembler.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"encoding/json"

internal/osbuild1/assembler_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"encoding/json"

internal/osbuild1/chrony_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type ChronyStageOptions struct {
 	Timeservers []string `json:"timeservers"`

internal/osbuild1/chrony_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/files_source.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type Secret struct {
 	Name string `json:"name,omitempty"`

internal/osbuild1/firewall_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type FirewallStageOptions struct {
 	Ports            []string `json:"ports,omitempty"`

internal/osbuild1/firewall_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/first_boot_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type FirstBootStageOptions struct {
 	Commands       []string `json:"commands"`

internal/osbuild1/first_boot_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

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.
 //

internal/osbuild1/fix_bls_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/fstab_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 // The FSTabStageOptions describe the content of the /etc/fstab file.
 //

internal/osbuild1/fstab_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/groups_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type GroupsStageOptions struct {
 	Groups map[string]GroupsStageOptionsGroup `json:"groups"`

internal/osbuild1/groups_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/grub2_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import "github.com/google/uuid"
 

internal/osbuild1/grub2_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/hostname_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type HostnameStageOptions struct {
 	Hostname string `json:"hostname"`

internal/osbuild1/hostname_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/kernel_cmdline_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 // KernelCmdlineStageOptions describe how to create kernel-cmdline stage
 //

internal/osbuild1/kernel_cmdline_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/keymap_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type KeymapStageOptions struct {
 	Keymap string `json:"keymap"`

internal/osbuild1/keymap_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/locale_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 // The LocaleStageOptions describes the image's locale.
 //

internal/osbuild1/locale_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/osbuild.go

@@ -1,6 +1,6 @@
 // Package osbuild provides primitives for representing and (un)marshalling
-// OSBuild types.
+// OSBuild (schema v1) types.
-package osbuild
+package osbuild1
 
 // A Manifest represents an OSBuild source and pipeline manifest
 type Manifest struct {

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"

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 {

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.
 //

internal/osbuild1/rawfs_assembler.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import "github.com/google/uuid"
 

internal/osbuild1/result.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"encoding/json"

internal/osbuild1/result_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"bytes"

internal/osbuild1/rhsm_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 // RHSMStageOptions describes configuration of the RHSM stage.
 //

internal/osbuild1/rhsm_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

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 {

internal/osbuild1/rpm_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 // The RPMStageOptions describe the operations of the RPM stage.
 //

internal/osbuild1/rpm_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

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 {

internal/osbuild1/script_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/selinux_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 // The SELinuxStageOptions describe how to apply selinux labels.
 //

internal/osbuild1/selinux_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/source.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"encoding/json"

internal/osbuild1/source_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"bytes"

internal/osbuild1/stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"encoding/json"

internal/osbuild1/stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"bytes"

internal/osbuild1/sysconfig_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type SysconfigStageOptions struct {
 	Kernel  SysconfigKernelOptions  `json:"kernel,omitempty"`

internal/osbuild1/sysconfig_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/systemd_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type SystemdStageOptions struct {
 	EnabledServices  []string `json:"enabled_services,omitempty"`

internal/osbuild1/systemd_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/tar_assembler.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 // TarAssemblerOptions desrcibe how to assemble a tree into a tar ball.
 //

internal/osbuild1/timezone_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type TimezoneStageOptions struct {
 	Zone string `json:"zone"`

internal/osbuild1/timezone_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/users_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 type UsersStageOptions struct {
 	Users map[string]UsersStageOptionsUser `json:"users"`

internal/osbuild1/users_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

internal/osbuild1/zipl_stage.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 // The ZiplStageOptions describe how to create zipl stage
 //

internal/osbuild1/zipl_stage_test.go

@@ -1,4 +1,4 @@
-package osbuild
+package osbuild1
 
 import (
 	"testing"

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"
 )

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"

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"
 )