change package names to apache

cmd/chisel/cmd_cut.go

@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/jessevdk/go-flags"
 
-	"github.com/canonical/chisel/internal/apache/util"
+	"github.com/canonical/chisel/internal/apacheutil"
 	"github.com/canonical/chisel/internal/archive"
 	"github.com/canonical/chisel/internal/cache"
 	"github.com/canonical/chisel/internal/setup"
@@ -44,9 +44,9 @@ func (cmd *cmdCut) Execute(args []string) error {
 		return ErrExtraArgs
 	}
 
-	sliceKeys := make([]util.SliceKey, len(cmd.Positional.SliceRefs))
+	sliceKeys := make([]apacheutil.SliceKey, len(cmd.Positional.SliceRefs))
 	for i, sliceRef := range cmd.Positional.SliceRefs {
-		sliceKey, err := util.ParseSliceKey(sliceRef)
+		sliceKey, err := apacheutil.ParseSliceKey(sliceRef)
 		if err != nil {
 			return err
 		}

cmd/chisel/cmd_info.go

@@ -8,7 +8,7 @@ import (
 	"github.com/jessevdk/go-flags"
 	"gopkg.in/yaml.v3"
 
-	"github.com/canonical/chisel/internal/apache/util"
+	"github.com/canonical/chisel/internal/apacheutil"
 	"github.com/canonical/chisel/internal/setup"
 )
 
@@ -83,7 +83,7 @@ func selectPackageSlices(release *setup.Release, queries []string) (packages []*
 	pkgSlices := make(map[string][]string)
 	allPkgSlices := make(map[string]bool)
 
-	sliceExists := func(key util.SliceKey) bool {
+	sliceExists := func(key apacheutil.SliceKey) bool {
 		pkg, ok := release.Packages[key.Package]
 		if !ok {
 			return false
@@ -94,7 +94,7 @@ func selectPackageSlices(release *setup.Release, queries []string) (packages []*
 	for _, query := range queries {
 		var pkg, slice string
 		if strings.Contains(query, "_") {
-			key, err := util.ParseSliceKey(query)
+			key, err := apacheutil.ParseSliceKey(query)
 			if err != nil || !sliceExists(key) {
 				notFound = append(notFound, query)
 				continue

internal/apache/testutil/manifest.go → internal/apachetestutil/manifest.go

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package testutil
+package apachetestutil
 
 import (
 	"gopkg.in/check.v1"

internal/apache/util/log.go → internal/apacheutil/log.go

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package util
+package apacheutil
 
 import (
 	"fmt"

internal/apache/util/suite_test.go → internal/apacheutil/suite_test.go

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package util_test
+package apacheutil_test
 
 import (
 	"testing"
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/chisel/internal/apache/util"
+	"github.com/canonical/chisel/internal/apacheutil"
 )
 
 func Test(t *testing.T) { TestingT(t) }
@@ -17,11 +17,11 @@ type S struct{}
 var _ = Suite(&S{})
 
 func (s *S) SetUpTest(c *C) {
-	util.SetDebug(true)
-	util.SetLogger(c)
+	apacheutil.SetDebug(true)
+	apacheutil.SetLogger(c)
 }
 
 func (s *S) TearDownTest(c *C) {
-	util.SetDebug(false)
-	util.SetLogger(nil)
+	apacheutil.SetDebug(false)
+	apacheutil.SetLogger(nil)
 }

internal/apache/util/util.go → internal/apacheutil/util.go

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package util
+package apacheutil
 
 import (
 	"fmt"

internal/apache/util/util_test.go → internal/apacheutil/util_test.go

@@ -1,47 +1,47 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package util_test
+package apacheutil_test
 
 import (
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/chisel/internal/apache/util"
+	"github.com/canonical/chisel/internal/apacheutil"
 )
 
 var sliceKeyTests = []struct {
 	input    string
-	expected util.SliceKey
+	expected apacheutil.SliceKey
 	err      string
 }{{
 	input:    "foo_bar",
-	expected: util.SliceKey{Package: "foo", Slice: "bar"},
+	expected: apacheutil.SliceKey{Package: "foo", Slice: "bar"},
 }, {
 	input:    "fo_bar",
-	expected: util.SliceKey{Package: "fo", Slice: "bar"},
+	expected: apacheutil.SliceKey{Package: "fo", Slice: "bar"},
 }, {
 	input:    "1234_bar",
-	expected: util.SliceKey{Package: "1234", Slice: "bar"},
+	expected: apacheutil.SliceKey{Package: "1234", Slice: "bar"},
 }, {
 	input:    "foo1.1-2-3_bar",
-	expected: util.SliceKey{Package: "foo1.1-2-3", Slice: "bar"},
+	expected: apacheutil.SliceKey{Package: "foo1.1-2-3", Slice: "bar"},
 }, {
 	input:    "foo-pkg_dashed-slice-name",
-	expected: util.SliceKey{Package: "foo-pkg", Slice: "dashed-slice-name"},
+	expected: apacheutil.SliceKey{Package: "foo-pkg", Slice: "dashed-slice-name"},
 }, {
 	input:    "foo+_bar",
-	expected: util.SliceKey{Package: "foo+", Slice: "bar"},
+	expected: apacheutil.SliceKey{Package: "foo+", Slice: "bar"},
 }, {
 	input:    "foo_slice123",
-	expected: util.SliceKey{Package: "foo", Slice: "slice123"},
+	expected: apacheutil.SliceKey{Package: "foo", Slice: "slice123"},
 }, {
 	input:    "g++_bins",
-	expected: util.SliceKey{Package: "g++", Slice: "bins"},
+	expected: apacheutil.SliceKey{Package: "g++", Slice: "bins"},
 }, {
 	input:    "a+_bar",
-	expected: util.SliceKey{Package: "a+", Slice: "bar"},
+	expected: apacheutil.SliceKey{Package: "a+", Slice: "bar"},
 }, {
 	input:    "a._bar",
-	expected: util.SliceKey{Package: "a.", Slice: "bar"},
+	expected: apacheutil.SliceKey{Package: "a.", Slice: "bar"},
 }, {
 	input: "foo_ba",
 	err:   `invalid slice reference: "foo_ba"`,
@@ -85,7 +85,7 @@ var sliceKeyTests = []struct {
 
 func (s *S) TestParseSliceKey(c *C) {
 	for _, test := range sliceKeyTests {
-		key, err := util.ParseSliceKey(test.input)
+		key, err := apacheutil.ParseSliceKey(test.input)
 		if test.err != "" {
 			c.Assert(err, ErrorMatches, test.err)
 			continue

internal/manifestutil/manifestutil_test.go

@@ -7,7 +7,7 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"github.com/canonical/chisel/internal/apache/testutil"
+	"github.com/canonical/chisel/internal/apachetestutil"
 	"github.com/canonical/chisel/internal/archive"
 	"github.com/canonical/chisel/internal/manifestutil"
 	"github.com/canonical/chisel/internal/setup"
@@ -120,7 +120,7 @@ var generateManifestTests = []struct {
 	report      *manifestutil.Report
 	packageInfo []*archive.PackageInfo
 	selection   []*setup.Slice
-	expected    *testutil.ManifestContents
+	expected    *apachetestutil.ManifestContents
 	error       string
 }{{
 	summary:   "Basic",
@@ -155,7 +155,7 @@ var generateManifestTests = []struct {
 		Arch:    "a2",
 		SHA256:  "s2",
 	}},
-	expected: &testutil.ManifestContents{
+	expected: &apachetestutil.ManifestContents{
 		Paths: []*manifest.Path{{
 			Kind:        "path",
 			Path:        "/file",
@@ -397,7 +397,7 @@ var generateManifestTests = []struct {
 		Arch:    "a1",
 		SHA256:  "s1",
 	}},
-	expected: &testutil.ManifestContents{
+	expected: &apachetestutil.ManifestContents{
 		Paths: []*manifest.Path{{
 			Kind:        "path",
 			Path:        "/file",
@@ -553,7 +553,7 @@ func (s *S) TestGenerateManifests(c *C) {
 		c.Assert(err, IsNil)
 		err = manifest.Validate(mfest)
 		c.Assert(err, IsNil)
-		contents := testutil.DumpManifestContents(c, mfest)
+		contents := apachetestutil.DumpManifestContents(c, mfest)
 		c.Assert(contents, DeepEquals, test.expected)
 	}
 }

internal/setup/setup.go

@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/crypto/openpgp/packet"
 
-	"github.com/canonical/chisel/internal/apache/util"
+	"github.com/canonical/chisel/internal/apacheutil"
 	"github.com/canonical/chisel/internal/strdist"
 )
 
@@ -43,7 +43,7 @@ type Package struct {
 type Slice struct {
 	Package   string
 	Name      string
-	Essential []util.SliceKey
+	Essential []apacheutil.SliceKey
 	Contents  map[string]PathInfo
 	Scripts   SliceScripts
 }
@@ -139,7 +139,7 @@ func ReadRelease(dir string) (*Release, error) {
 }
 
 func (r *Release) validate() error {
-	keys := []util.SliceKey(nil)
+	keys := []apacheutil.SliceKey(nil)
 
 	// Check for info conflicts and prepare for following checks. A conflict
 	// means that two slices attempt to extract different files or directories
@@ -156,7 +156,7 @@ func (r *Release) validate() error {
 	globs := make(map[string]*Slice)
 	for _, pkg := range r.Packages {
 		for _, new := range pkg.Slices {
-			keys = append(keys, util.SliceKey{pkg.Name, new.Name})
+			keys = append(keys, apacheutil.SliceKey{pkg.Name, new.Name})
 			for newPath, newInfo := range new.Contents {
 				if old, ok := paths[newPath]; ok {
 					oldInfo := old.Contents[newPath]
@@ -237,7 +237,7 @@ func (r *Release) validate() error {
 	return nil
 }
 
-func order(pkgs map[string]*Package, keys []util.SliceKey) ([]util.SliceKey, error) {
+func order(pkgs map[string]*Package, keys []apacheutil.SliceKey) ([]apacheutil.SliceKey, error) {
 
 	// Preprocess the list to improve error messages.
 	for _, key := range keys {
@@ -250,9 +250,9 @@ func order(pkgs map[string]*Package, keys []util.SliceKey) ([]util.SliceKey, err
 
 	// Collect all relevant package slices.
 	successors := map[string][]string{}
-	pending := append([]util.SliceKey(nil), keys...)
+	pending := append([]apacheutil.SliceKey(nil), keys...)
 
-	seen := make(map[util.SliceKey]bool)
+	seen := make(map[apacheutil.SliceKey]bool)
 	for i := 0; i < len(pending); i++ {
 		key := pending[i]
 		if seen[key] {
@@ -275,14 +275,14 @@ func order(pkgs map[string]*Package, keys []util.SliceKey) ([]util.SliceKey, err
 	}
 
 	// Sort them up.
-	var order []util.SliceKey
+	var order []apacheutil.SliceKey
 	for _, names := range tarjanSort(successors) {
 		if len(names) > 1 {
 			return nil, fmt.Errorf("essential loop detected: %s", strings.Join(names, ", "))
 		}
 		name := names[0]
 		dot := strings.IndexByte(name, '_')
-		order = append(order, util.SliceKey{name[:dot], name[dot+1:]})
+		order = append(order, apacheutil.SliceKey{name[:dot], name[dot+1:]})
 	}
 
 	return order, nil
@@ -323,7 +323,7 @@ func readSlices(release *Release, baseDir, dirName string) error {
 		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".yaml") {
 			continue
 		}
-		match := util.FnameExp.FindStringSubmatch(entry.Name())
+		match := apacheutil.FnameExp.FindStringSubmatch(entry.Name())
 		if match == nil {
 			return fmt.Errorf("invalid slice definition filename: %q", entry.Name())
 		}
@@ -354,7 +354,7 @@ func stripBase(baseDir, path string) string {
 	return strings.TrimPrefix(path, baseDir+string(filepath.Separator))
 }
 
-func Select(release *Release, slices []util.SliceKey) (*Selection, error) {
+func Select(release *Release, slices []apacheutil.SliceKey) (*Selection, error) {
 	logf("Selecting slices...")
 
 	selection := &Selection{