From ebe03617cf6c7bbb4435b3cb6d66db5b15275c9c Mon Sep 17 00:00:00 2001 From: Jack Shaw Date: Fri, 12 Apr 2024 12:04:15 +0100 Subject: [PATCH 1/2] Remove unused functions + drop series before focal We wish to remove the concept of a series from the juju extended codebase. Series is something that juju/packaging relies on quite heavily We can change this by removing a number of unused functions/methods which take in series as parameters. Also, since we no longer support series before focal, we can take out a lot of the special cases and make the PackingingConfigurers series agnostic --- config/apt_test.go | 22 +------ config/centos_constants.go | 18 ------ config/configurer.go | 29 --------- config/configurer_apt.go | 2 +- config/constants_test.go | 17 ------ config/export_test.go | 1 - config/functions.go | 44 -------------- config/functions_test.go | 81 ------------------------- config/global_constants.go | 10 ---- config/interface.go | 30 ++++------ config/interface_test.go | 6 +- config/opensuse_constants.go | 11 ---- config/ubuntu_constants.go | 50 ---------------- config/utils.go | 15 ----- config/yum_test.go | 20 +------ config/zypper_test.go | 20 +------ go.mod | 2 +- go.sum | 111 ----------------------------------- 18 files changed, 18 insertions(+), 471 deletions(-) delete mode 100644 config/functions.go delete mode 100644 config/functions_test.go delete mode 100644 config/utils.go diff --git a/config/apt_test.go b/config/apt_test.go index f707566..ef1a6fd 100644 --- a/config/apt_test.go +++ b/config/apt_test.go @@ -5,8 +5,6 @@ package config_test import ( - "fmt" - jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" @@ -20,29 +18,13 @@ type AptSuite struct { } func (s *AptSuite) SetUpSuite(c *gc.C) { - s.pacconfer = config.NewAptPackagingConfigurer(testedSeriesUbuntu) + s.pacconfer = config.NewAptPackagingConfigurer() } func (s *AptSuite) TestDefaultPackages(c *gc.C) { c.Assert(s.pacconfer.DefaultPackages(), gc.DeepEquals, config.UbuntuDefaultPackages) } -func (s *AptSuite) TestGetPackageNameForSeriesSameSeries(c *gc.C) { - for _, pack := range testedPackages { - res, err := s.pacconfer.GetPackageNameForSeries(pack, testedSeriesUbuntu) - c.Assert(err, jc.ErrorIsNil) - c.Assert(res, gc.Equals, pack) - } -} - -func (s *AptSuite) TestGetPackageNameForSeriesErrors(c *gc.C) { - for _, pack := range testedPackages { - res, err := s.pacconfer.GetPackageNameForSeries(pack, "some-other-series") - c.Assert(res, gc.Equals, "") - c.Assert(err, gc.ErrorMatches, fmt.Sprintf("no equivalent package found for series %s: %s", "some-other-series", pack)) - } -} - func (s *AptSuite) TestIsCloudArchivePackage(c *gc.C) { testedPacks := []string{ "random", @@ -85,8 +67,6 @@ func (s *AptSuite) TestRenderPreferences(c *gc.C) { func (s *AptSuite) TestApplyCloudArchiveTarget(c *gc.C) { res := s.pacconfer.ApplyCloudArchiveTarget("some-package") c.Assert(res, gc.DeepEquals, []string{ - "--target-release", - "precise-updates/cloud-tools", "some-package", }) } diff --git a/config/centos_constants.go b/config/centos_constants.go index eef1023..6a22b1a 100644 --- a/config/centos_constants.go +++ b/config/centos_constants.go @@ -4,10 +4,6 @@ package config -import ( - "github.com/juju/packaging/v2" -) - const ( // CentOSCloudArchiveUrl is the url of the (future) cloud archive for CentOS. // TODO (people of the distant future): add this when it is available. @@ -39,17 +35,3 @@ var cloudArchivePackagesCentOS = map[string]struct{}{ // CentOS 7+ especially for Juju is to ever occur, please add the relevant // package listings here. } - -// centOSToUbuntuPackageNameMap is a map for converting package names from -// their names as found in CentOS repositories to their equivalent in Ubuntu. -// It is implemented as the flipped package mapper for Ubuntu. -var centOSToUbuntuPackageNameMap = flipMap(ubuntuToCentOSPackageNameMap) - -// configureCloudArchiveSourceCentOS is a helper function which returns the -// cloud archive PackageSource and PackagePreferences for the given series for -// CentOS machines. -func configureCloudArchiveSourceCentOS(series string) (packaging.PackageSource, packaging.PackagePreferences) { - // TODO (aznashwan, all): implement this when the - // archive for CentOS goes up. - return packaging.PackageSource{}, packaging.PackagePreferences{} -} diff --git a/config/configurer.go b/config/configurer.go index b55abc8..3dac7fe 100644 --- a/config/configurer.go +++ b/config/configurer.go @@ -4,13 +4,8 @@ package config -import ( - "github.com/juju/errors" -) - // baseConfigurer is the base type of a Configurer object. type baseConfigurer struct { - series string defaultPackages []string cloudArchivePackages map[string]struct{} } @@ -20,30 +15,6 @@ func (c *baseConfigurer) DefaultPackages() []string { return c.defaultPackages } -// GetPackageNameForSeries is defined on the PackagingConfigurer interface. -func (c *baseConfigurer) GetPackageNameForSeries(pack, series string) (string, error) { - if c.series == series { - return pack, nil - } - - // TODO(aznashwan): find a more deterministic way of filtering series that - // does not imply importing version from core. - switch series { - case "centos7": - res, ok := centOSToUbuntuPackageNameMap[pack] - if !ok { - return "", errors.Errorf("no equivalent package found for series %s: %s", series, pack) - } - return res, nil - default: - res, ok := ubuntuToCentOSPackageNameMap[pack] - if !ok { - return "", errors.Errorf("no equivalent package found for series %s: %s", series, pack) - } - return res, nil - } -} - // IsCloudArchivePackage is defined on the PackagingConfigurer interface. func (c *baseConfigurer) IsCloudArchivePackage(pack string) bool { _, ok := c.cloudArchivePackages[pack] diff --git a/config/configurer_apt.go b/config/configurer_apt.go index 7d05128..9f83b26 100644 --- a/config/configurer_apt.go +++ b/config/configurer_apt.go @@ -25,5 +25,5 @@ func (c *aptConfigurer) RenderPreferences(prefs packaging.PackagePreferences) (s // ApplyCloudArchiveTarget is defined on the PackagingConfigurer interface. func (c *aptConfigurer) ApplyCloudArchiveTarget(pack string) []string { - return []string{"--target-release", getTargetReleaseSpecifierUbuntu(c.series), pack} + return []string{pack} } diff --git a/config/constants_test.go b/config/constants_test.go index e396e77..f6a0b33 100644 --- a/config/constants_test.go +++ b/config/constants_test.go @@ -7,23 +7,6 @@ package config_test import "github.com/juju/packaging/v2" var ( - // testedSeriesUbuntu is simply the series to use in Ubuntu tests. - testedSeriesUbuntu = "precise" - - // testedSeriesCentOS is simply the series we use in CentOS tests. - testedSeriesCentOS = "centos7" - - // testedSeriesOpenSUSE is simply the series we use in OpenSUSE tests. - testedSeriesOpenSUSE = "opensuseleap" - - // testedPackages is a slice of random package tests to run tests on. - testedPackages = []string{ - "awesome-wm", - "archey3", - "arch-chroot", - "ranger", - } - testedSource = packaging.PackageSource{ Name: "Some Totally Official Source.", URL: "some-source.com/packages", diff --git a/config/export_test.go b/config/export_test.go index 02741d7..dceb86c 100644 --- a/config/export_test.go +++ b/config/export_test.go @@ -8,5 +8,4 @@ var ( CloudArchivePackagesUbuntu = cloudArchivePackagesUbuntu CloudArchivePackagesCentOS = cloudArchivePackagesCentOS CloudArchivePackagesOpenSUSE = cloudArchivePackagesOpenSUSE - SeriesRequiringCloudTools = seriesRequiringCloudTools ) diff --git a/config/functions.go b/config/functions.go deleted file mode 100644 index 5358856..0000000 --- a/config/functions.go +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2015 Canonical Ltd. -// Copyright 2015 Cloudbase Solutions SRL -// Licensed under the LGPLv3, see LICENCE file for details. - -package config - -import ( - "github.com/juju/packaging/v2" -) - -// SeriesRequiresCloudArchiveTools signals whether the given series -// requires the configuration of cloud archive cloud tools. -func SeriesRequiresCloudArchiveTools(series string) bool { - return seriesRequiringCloudTools[series] -} - -// GetCloudArchiveSource returns the PackageSource and associated -// PackagePreferences for the cloud archive for the given series. -func GetCloudArchiveSource(series string) (packaging.PackageSource, packaging.PackagePreferences) { - // TODO (aznashwan): find a more deterministic way of filtering series that - // does not imply importing version from core. - switch series { - case "centos7": - // NOTE: as of yet, the below function does nothing for CentOS. - return configureCloudArchiveSourceCentOS(series) - case "opensuseleap": - // NOTE: do the sam that CentOS case - return configureCloudArchiveSourceOpenSUSE(series) - default: - return configureCloudArchiveSourceUbuntu(series) - } -} - -func RequiresBackports(series string, pkg string) bool { - backportPkgs := backportsBySeries[series] - - for _, backportPkg := range backportPkgs { - if pkg == backportPkg { - return true - } - } - - return false -} diff --git a/config/functions_test.go b/config/functions_test.go deleted file mode 100644 index f2b59fa..0000000 --- a/config/functions_test.go +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright 2015 Canonical Ltd. -// Copyright 2015 Cloudbase Solutions SRL -// Licensed under the LGPLv3, see LICENCE file for details. - -package config_test - -import ( - "fmt" - - jc "github.com/juju/testing/checkers" - gc "gopkg.in/check.v1" - - "github.com/juju/packaging/v2" - "github.com/juju/packaging/v2/config" -) - -var _ = gc.Suite(&FunctionsSuite{}) - -type FunctionsSuite struct { -} - -func (s *FunctionsSuite) TestSeriesRequiresCloudArchiveTools(c *gc.C) { - testedSeries := []string{ - "precise", - "centos7", - "rogentos", - "debian", - "mint", - "makulu", - "rhel lol", - "opensuseleap", - } - - for i, series := range testedSeries { - c.Logf("Test %d: series %s:", i+1, series) - - res := config.SeriesRequiresCloudArchiveTools(series) - _, req := config.SeriesRequiringCloudTools[series] - - c.Assert(res, gc.Equals, req) - } -} - -func (s *FunctionsSuite) TestGetCloudArchiveSourceCentOS(c *gc.C) { - src, prefs := config.GetCloudArchiveSource("centos7") - - c.Assert(src, gc.Equals, packaging.PackageSource{}) - c.Assert(prefs, gc.Equals, packaging.PackagePreferences{}) -} - -func (s *FunctionsSuite) TestGetCloudArchiveSourceOpenSUSE(c *gc.C) { - src, prefs := config.GetCloudArchiveSource("opensuseleap") - - c.Assert(src, gc.Equals, packaging.PackageSource{}) - c.Assert(prefs, gc.Equals, packaging.PackagePreferences{}) -} - -func (s *FunctionsSuite) TestGetCloudArchiveSourceUbuntu(c *gc.C) { - expectedSrc := packaging.PackageSource{ - URL: fmt.Sprintf("deb %s %s-updates/cloud-tools main", config.UbuntuCloudArchiveUrl, "precise"), - Key: config.UbuntuCloudArchiveSigningKey, - } - - expectedPrefs := packaging.PackagePreferences{ - Path: config.UbuntuCloudToolsPrefsPath, - Explanation: "Pin with lower priority, not to interfere with charms.", - Package: "*", - Pin: fmt.Sprintf("release n=%s-updates/cloud-tools", "precise"), - Priority: 400, - } - - src, prefs := config.GetCloudArchiveSource("precise") - - c.Assert(src, gc.Equals, expectedSrc) - c.Assert(prefs, gc.Equals, expectedPrefs) -} - -func (s *FunctionsSuite) TestRequiresBackportsTrustyLXD(c *gc.C) { - requiresBackports := config.RequiresBackports("trusty", "lxd") - c.Assert(requiresBackports, jc.IsTrue) -} diff --git a/config/global_constants.go b/config/global_constants.go index f4603d5..d74fd5f 100644 --- a/config/global_constants.go +++ b/config/global_constants.go @@ -30,12 +30,6 @@ function package_manager_loop { ) var ( - seriesRequiringCloudTools = map[string]bool{ - // TODO (aznashwan, all): add any other OS's - // which require cloud tools' series here. - "precise": true, - } - // DefaultPackages is a list of the default packages Juju'd like to see // installed on all it's machines. DefaultPackages = []string{ @@ -43,8 +37,4 @@ var ( // for example: "curl", } - - backportsBySeries = map[string][]string{ - "trusty": {"lxd"}, - } ) diff --git a/config/interface.go b/config/interface.go index 4fbc399..322e86b 100644 --- a/config/interface.go +++ b/config/interface.go @@ -18,11 +18,6 @@ type PackagingConfigurer interface { // installed the vast majority of cases on any specific machine DefaultPackages() []string - // GetPackageNameForSeries returns the equivalent package name of the - // specified package for the given series or an error if no mapping - // for it exists. - GetPackageNameForSeries(pack string, series string) (string, error) - // IsCloudArchivePackage signals whether the given package is a // cloud archive package and thus should be set as such. IsCloudArchivePackage(pack string) bool @@ -40,40 +35,35 @@ type PackagingConfigurer interface { RenderPreferences(prefs packaging.PackagePreferences) (string, error) } -func NewPackagingConfigurer(series string) (PackagingConfigurer, error) { - switch series { - // TODO (aznashwan): find a more deterministic way of selection here - // without importing version from core. - case "centos7": - return NewYumPackagingConfigurer(series), nil - case "opensuseleap": - return NewZypperPackagingConfigurer(series), nil +func NewPackagingConfigurer(os string) (PackagingConfigurer, error) { + switch os { + case "centos": + return NewYumPackagingConfigurer(), nil + case "opensuse": + return NewZypperPackagingConfigurer(), nil default: - return NewAptPackagingConfigurer(series), nil + return NewAptPackagingConfigurer(), nil } } // NewAptPackagingConfigurer returns a PackagingConfigurer for apt-based systems. -func NewAptPackagingConfigurer(series string) PackagingConfigurer { +func NewAptPackagingConfigurer() PackagingConfigurer { return &aptConfigurer{&baseConfigurer{ - series: series, defaultPackages: UbuntuDefaultPackages, cloudArchivePackages: cloudArchivePackagesUbuntu, }} } // NewYumPackagingConfigurer returns a PackagingConfigurer for yum-based systems. -func NewYumPackagingConfigurer(series string) PackagingConfigurer { +func NewYumPackagingConfigurer() PackagingConfigurer { return &yumConfigurer{&baseConfigurer{ - series: series, defaultPackages: CentOSDefaultPackages, cloudArchivePackages: cloudArchivePackagesCentOS, }} } -func NewZypperPackagingConfigurer(series string) PackagingConfigurer { +func NewZypperPackagingConfigurer() PackagingConfigurer { return &zypperConfigurer{&baseConfigurer{ - series: series, defaultPackages: OpenSUSEDefaultPackages, cloudArchivePackages: cloudArchivePackagesOpenSUSE, }} diff --git a/config/interface_test.go b/config/interface_test.go index 3aa3693..c3c344c 100644 --- a/config/interface_test.go +++ b/config/interface_test.go @@ -8,6 +8,6 @@ import ( "github.com/juju/packaging/v2/config" ) -var _ config.PackagingConfigurer = config.NewAptPackagingConfigurer("some-series") -var _ config.PackagingConfigurer = config.NewYumPackagingConfigurer("some-series") -var _ config.PackagingConfigurer = config.NewZypperPackagingConfigurer("some-series") +var _ config.PackagingConfigurer = config.NewAptPackagingConfigurer() +var _ config.PackagingConfigurer = config.NewYumPackagingConfigurer() +var _ config.PackagingConfigurer = config.NewZypperPackagingConfigurer() diff --git a/config/opensuse_constants.go b/config/opensuse_constants.go index 418b131..8fd15da 100644 --- a/config/opensuse_constants.go +++ b/config/opensuse_constants.go @@ -4,10 +4,6 @@ package config -import ( - "github.com/juju/packaging/v2" -) - const ( // OpenSUSESourcesFile is the default file which lists all core sources @@ -30,10 +26,3 @@ var cloudArchivePackagesOpenSUSE = map[string]struct{}{ // OpenSUSE Leap + especially for Juju is to ever occur, please add the relevant // package listings here. } - -// configureCloudArchiveSourceOpenSUSE is a helper function which returns the -// cloud archive PackageSource and PackagePreferences for the given series for -// OpenSUSE machines. -func configureCloudArchiveSourceOpenSUSE(series string) (packaging.PackageSource, packaging.PackagePreferences) { - return packaging.PackageSource{}, packaging.PackagePreferences{} -} diff --git a/config/ubuntu_constants.go b/config/ubuntu_constants.go index 11dd9fb..e5d5627 100644 --- a/config/ubuntu_constants.go +++ b/config/ubuntu_constants.go @@ -4,12 +4,6 @@ package config -import ( - "fmt" - - "github.com/juju/packaging/v2" -) - const ( // UbuntuCloudArchiveUrl is the url of the cloud archive on Ubuntu. UbuntuCloudArchiveUrl = "http://ubuntu-cloud.archive.canonical.com/ubuntu" @@ -113,47 +107,3 @@ var cloudArchivePackagesUbuntu = map[string]struct{}{ "uvtool": {}, "yui3": {}, } - -// ubuntuToCentOSPackageNameMap is a map for converting package names from their -// names in Ubuntu repositories to their equivalent CentOS names. -var ubuntuToCentOSPackageNameMap = map[string]string{ - // TODO(aznashwan, everyone): thouroughly research differing package - // names and add them to this map. - // NOTE: the following are the packages which currently count as cloud - // archive packages and require an equivalent on CentOS when an rpm - // cloud archive is up and running: - // - // "cloud-utils": "???", - // "cloud-image-utils": "???", -} - -// configureCloudArchiveSourceUbuntu is a helper function which returns the -// cloud archive PackageSource and PackagePreferences for the given series for -// Ubuntu machines. -func configureCloudArchiveSourceUbuntu(series string) (packaging.PackageSource, packaging.PackagePreferences) { - source := packaging.PackageSource{ - URL: fmt.Sprintf("deb %s %s-updates/cloud-tools main", UbuntuCloudArchiveUrl, series), - Key: UbuntuCloudArchiveSigningKey, - } - - prefs := packaging.PackagePreferences{ - Path: UbuntuCloudToolsPrefsPath, - Explanation: "Pin with lower priority, not to interfere with charms.", - Package: "*", - Pin: fmt.Sprintf("release n=%s-updates/cloud-tools", series), - Priority: 400, - } - - return source, prefs -} - -// getTargetReleaseSpecifierUbuntu returns the specifier that can be passed to -// apt in order to ensure that it pulls the package from that particular source. -func getTargetReleaseSpecifierUbuntu(series string) string { - switch series { - case "precise": - return "precise-updates/cloud-tools" - default: - return "" - } -} diff --git a/config/utils.go b/config/utils.go deleted file mode 100644 index d6396d3..0000000 --- a/config/utils.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2015 Canonical Ltd. -// Copyright 2015 Cloudbase Solutions SRL -// Licensed under the LGPLv3, see LICENCE file for details. - -package config - -// flipMap is a helper function which flips a strings map, making the -// keys of the initial one the values and vice-versa. -func flipMap(m map[string]string) map[string]string { - res := make(map[string]string) - for k, v := range m { - res[v] = k - } - return res -} diff --git a/config/yum_test.go b/config/yum_test.go index 7333e15..d167b75 100644 --- a/config/yum_test.go +++ b/config/yum_test.go @@ -5,8 +5,6 @@ package config_test import ( - "fmt" - jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" @@ -20,29 +18,13 @@ type YumSuite struct { } func (s *YumSuite) SetUpSuite(c *gc.C) { - s.pacconfer = config.NewYumPackagingConfigurer(testedSeriesCentOS) + s.pacconfer = config.NewYumPackagingConfigurer() } func (s *YumSuite) TestDefaultPackages(c *gc.C) { c.Assert(s.pacconfer.DefaultPackages(), gc.DeepEquals, config.CentOSDefaultPackages) } -func (s *YumSuite) TestGetPackageNameForSeriesSameSeries(c *gc.C) { - for _, pack := range testedPackages { - res, err := s.pacconfer.GetPackageNameForSeries(pack, testedSeriesCentOS) - c.Assert(err, jc.ErrorIsNil) - c.Assert(res, gc.Equals, pack) - } -} - -func (s *YumSuite) TestGetPackageNameForSeriesErrors(c *gc.C) { - for _, pack := range testedPackages { - res, err := s.pacconfer.GetPackageNameForSeries(pack, "some-other-series") - c.Assert(res, gc.Equals, "") - c.Assert(err, gc.ErrorMatches, fmt.Sprintf("no equivalent package found for series %s: %s", "some-other-series", pack)) - } -} - func (s *YumSuite) TestIsCloudArchivePackage(c *gc.C) { testedPacks := []string{ "random", diff --git a/config/zypper_test.go b/config/zypper_test.go index 6990d24..b6ccc79 100644 --- a/config/zypper_test.go +++ b/config/zypper_test.go @@ -4,8 +4,6 @@ package config_test import ( - "fmt" - jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" @@ -19,29 +17,13 @@ type ZypperSuite struct { } func (s *ZypperSuite) SetUpSuite(c *gc.C) { - s.pacconfer = config.NewZypperPackagingConfigurer(testedSeriesOpenSUSE) + s.pacconfer = config.NewZypperPackagingConfigurer() } func (s *ZypperSuite) TestDefaultPackages(c *gc.C) { c.Assert(s.pacconfer.DefaultPackages(), gc.DeepEquals, config.OpenSUSEDefaultPackages) } -func (s *ZypperSuite) TestGetPackageNameForSeriesSameSeries(c *gc.C) { - for _, pack := range testedPackages { - res, err := s.pacconfer.GetPackageNameForSeries(pack, testedSeriesOpenSUSE) - c.Assert(err, jc.ErrorIsNil) - c.Assert(res, gc.Equals, pack) - } -} - -func (s *ZypperSuite) TestGetPackageNameForSeriesErrors(c *gc.C) { - for _, pack := range testedPackages { - res, err := s.pacconfer.GetPackageNameForSeries(pack, "some-other-series") - c.Assert(res, gc.Equals, "") - c.Assert(err, gc.ErrorMatches, fmt.Sprintf("no equivalent package found for series %s: %s", "some-other-series", pack)) - } -} - func (s *ZypperSuite) TestIsCloudArchivePackage(c *gc.C) { testedPacks := []string{ "random", diff --git a/go.mod b/go.mod index 878d10f..f91934f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/juju/packaging/v2 -go 1.17 +go 1.21 require ( github.com/juju/clock v0.0.0-20220203021603-d9deb868a28a diff --git a/go.sum b/go.sum index e8ecebd..a26d6d0 100644 --- a/go.sum +++ b/go.sum @@ -1,79 +1,25 @@ -github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= -github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= -github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= -github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= -github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= -github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/juju/ansiterm v0.0.0-20160907234532-b99631de12cf/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= -github.com/juju/ansiterm v0.0.0-20210706145210-9283cdf370b5/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= -github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c/go.mod h1:nD0vlnrUjcjJhqN5WuCWZyzfd5AHZAC9/ajvbSx69xA= -github.com/juju/clock v0.0.0-20220202072423-1b0f830854c4/go.mod h1:zDZCPSgCJQINeZtQwHx2/cFk4seaBC8Yiqe8V82xiP0= github.com/juju/clock v0.0.0-20220203021603-d9deb868a28a h1:Az/6CM/P5guGHNy7r6TkOCctv3lDmN3W1uhku7QMupk= github.com/juju/clock v0.0.0-20220203021603-d9deb868a28a/go.mod h1:GZ/FY8Cqw3KHG6DwRVPUKbSPTAwyrU28xFi5cqZnLsc= -github.com/juju/cmd v0.0.0-20171107070456-e74f39857ca0/go.mod h1:yWJQHl73rdSX4DHVKGqkAip+huBslxRwS8m9CrOLq18= -github.com/juju/cmd/v3 v3.0.0-20220202061353-b1cc80b193b0/go.mod h1:EoGJiEG+vbMwO9l+Es0SDTlaQPjH6nLcnnc4NfZB3cY= -github.com/juju/collections v0.0.0-20200605021417-0d0ec82b7271/go.mod h1:5XgO71dV1JClcOJE+4dzdn4HrI5LiyKd7PlVG6eZYhY= github.com/juju/collections v0.0.0-20220203020748-febd7cad8a7a h1:d7eZO8OS/ZXxdP0uq3E8CdoA1qNFaecAv90UxrxaY2k= github.com/juju/collections v0.0.0-20220203020748-febd7cad8a7a/go.mod h1:JWeZdyttIEbkR51z2S13+J+aCuHVe0F6meRy+P0YGDo= -github.com/juju/errors v0.0.0-20150916125642-1b5e39b83d18/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= -github.com/juju/errors v0.0.0-20200330140219-3fe23663418f/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= -github.com/juju/errors v0.0.0-20210818161939-5560c4c073ff/go.mod h1:i1eL7XREII6aHpQ2gApI/v6FkVUDEBremNkcBCKYAcY= github.com/juju/errors v0.0.0-20220203013757-bd733f3c86b9 h1:EJHbsNpQyupmMeWTq7inn+5L/WZ7JfzCVPJ+DP9McCQ= github.com/juju/errors v0.0.0-20220203013757-bd733f3c86b9/go.mod h1:TRm7EVGA3mQOqSVcBySRY7a9Y1/gyVhh/WTCnc5sD4U= -github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= -github.com/juju/httpprof v0.0.0-20141217160036-14bf14c30767/go.mod h1:+MaLYz4PumRkkyHYeXJ2G5g5cIW0sli2bOfpmbaMV/g= -github.com/juju/loggo v0.0.0-20170605014607-8232ab8918d9/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= -github.com/juju/loggo v0.0.0-20200526014432-9ce3a2e09b5e/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 h1:NO5tuyw++EGLnz56Q8KMyDZRwJwWO8jQnj285J3FOmY= github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4/go.mod h1:NIXFioti1SmKAlKNuUwbMenNdef59IF52+ZzuOmHYkg= -github.com/juju/mgo/v2 v2.0.0-20210302023703-70d5d206e208/go.mod h1:0OChplkvPTZ174D2FYZXg4IB9hbEwyHkD+zT+/eK+Fg= github.com/juju/mgo/v2 v2.0.0-20220111072304-f200228f1090 h1:zX5GoH3Jp8k1EjUFkApu/YZAYEn0PYQfg/U6IDyNyYs= github.com/juju/mgo/v2 v2.0.0-20220111072304-f200228f1090/go.mod h1:N614SE0a4e+ih2rg96Vi2PeC3cTpUOWgCTv3Cgk974c= -github.com/juju/mutex v0.0.0-20171110020013-1fe2a4bf0a3a/go.mod h1:Y3oOzHH8CQ0Ppt0oCKJ2JFO81/EsWenH5AEqigLH+yY= -github.com/juju/mutex/v2 v2.0.0-20220128011612-57176ebdcfa3/go.mod h1:TTCG9BJD9rCC4DZFz3jA0QvCqFDHw8Eqz0jstwY7RTQ= -github.com/juju/mutex/v2 v2.0.0-20220203023141-11eeddb42c6c/go.mod h1:jwCfBs/smYDaeZLqeaCi8CB8M+tOes4yf827HoOEoqk= github.com/juju/proxy v0.0.0-20220207021845-4d37a2e6a78f h1:uyyk7X1vlOwxy4zgo4svojJQOt001KRrWYN3U3Ev6fY= github.com/juju/proxy v0.0.0-20220207021845-4d37a2e6a78f/go.mod h1:gJt7i2qQhc30E7lU0/7nEQ6MoCQsMsWv+sIeJia1KO8= -github.com/juju/retry v0.0.0-20151029024821-62c620325291/go.mod h1:OohPQGsr4pnxwD5YljhQ+TZnuVRYpa5irjugL1Yuif4= -github.com/juju/retry v0.0.0-20180821225755-9058e192b216/go.mod h1:OohPQGsr4pnxwD5YljhQ+TZnuVRYpa5irjugL1Yuif4= github.com/juju/retry v0.0.0-20220204093819-62423bf33287 h1:U+7oMWEglXfiikIppNexButZRwKPlzLBGKYSNCXzXf8= github.com/juju/retry v0.0.0-20220204093819-62423bf33287/go.mod h1:SssN1eYeK3A2qjnFGTiVMbdzGJ2BfluaJblJXvuvgqA= -github.com/juju/testing v0.0.0-20180402130637-44801989f0f7/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= -github.com/juju/testing v0.0.0-20180517134105-72703b1e95eb/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= -github.com/juju/testing v0.0.0-20190723135506-ce30eb24acd2/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= -github.com/juju/testing v0.0.0-20210302031854-2c7ee8570c07/go.mod h1:7lxZW0B50+xdGFkvhAb8bwAGt6IU87JB1H9w4t8MNVM= -github.com/juju/testing v0.0.0-20210324180055-18c50b0c2098/go.mod h1:7lxZW0B50+xdGFkvhAb8bwAGt6IU87JB1H9w4t8MNVM= -github.com/juju/testing v0.0.0-20220202055744-1ad0816210a6/go.mod h1:QgWc2UdIPJ8t3rnvv95tFNOsQDfpXYEZDbP281o3b2c= github.com/juju/testing v0.0.0-20220203020004-a0ff61f03494 h1:XEDzpuZb8Ma7vLja3+5hzUqVTvAqm5Y+ygvnDs5iTMM= github.com/juju/testing v0.0.0-20220203020004-a0ff61f03494/go.mod h1:rUquetT0ALL48LHZhyRGvjjBH8xZaZ8dFClulKK5wK4= -github.com/juju/utils v0.0.0-20180424094159-2000ea4ff043/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk= -github.com/juju/utils v0.0.0-20200116185830-d40c2fe10647 h1:wQpkHVbIIpz1PCcLYku9KFWsJ7aEMQXHBBmLy3tRBTk= -github.com/juju/utils v0.0.0-20200116185830-d40c2fe10647/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk= -github.com/juju/utils/v2 v2.0.0-20200923005554-4646bfea2ef1/go.mod h1:fdlDtQlzundleLLz/ggoYinEt/LmnrpNKcNTABQATNI= -github.com/juju/utils/v3 v3.0.0-20220130232349-cd7ecef0e94a/go.mod h1:LzwbbEN7buYjySp4nqnti6c6olSqRXUk6RkbSUUP1n8= -github.com/juju/utils/v3 v3.0.0-20220202114721-338bb0530e89/go.mod h1:wf5w+8jyTh2IYnSX0sHnMJo4ZPwwuiBWn+xN3DkQg4k= github.com/juju/utils/v3 v3.0.0-20220203023959-c3fbc78a33b0 h1:bn+2Adl1yWqYjm3KSFlFqsvfLg2eq+XNL7GGMYApdVw= github.com/juju/utils/v3 v3.0.0-20220203023959-c3fbc78a33b0/go.mod h1:8csUcj1VRkfjNIRzBFWzLFCMLwLqsRWvkmhfVAUwbC4= -github.com/juju/version v0.0.0-20161031051906-1f41e27e54f2/go.mod h1:kE8gK5X0CImdr7qpSKl3xB2PmpySSmfj7zVbkZFs81U= -github.com/juju/version v0.0.0-20180108022336-b64dbd566305/go.mod h1:kE8gK5X0CImdr7qpSKl3xB2PmpySSmfj7zVbkZFs81U= -github.com/juju/version v0.0.0-20191219164919-81c1be00b9a6 h1:nrqc9b4YKpKV4lPI3GPPFbo5FUuxkWxgZE2Z8O4lgaw= -github.com/juju/version v0.0.0-20191219164919-81c1be00b9a6/go.mod h1:kE8gK5X0CImdr7qpSKl3xB2PmpySSmfj7zVbkZFs81U= -github.com/juju/version/v2 v2.0.0-20211007103408-2e8da085dc23/go.mod h1:Ljlbryh9sYaUSGXucslAEDf0A2XUSGvDbHJgW8ps6nc= github.com/juju/version/v2 v2.0.0-20220204124744-fc9915e3d935 h1:6YoyzXVW1XkqN86y2s/rz365Jm7EiAy39v2G5ikzvHU= github.com/juju/version/v2 v2.0.0-20220204124744-fc9915e3d935/go.mod h1:ZeFjNy+UFEWJDDPdzW7Cm9NeU6dsViGaFYhXzycLQrw= -github.com/julienschmidt/httprouter v1.1.1-0.20151013225520-77a895ad01eb/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -81,85 +27,28 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lunixbochs/vtclean v0.0.0-20160125035106-4fbf7632a2c6/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/masterzen/azure-sdk-for-go v3.2.0-beta.0.20161014135628-ee4f0065d00c+incompatible/go.mod h1:mf8fjOu33zCqxUjuiU3I8S1lJMyEAlH+0F2+M5xl3hE= -github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc= -github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc= -github.com/masterzen/winrm v0.0.0-20161014151040-7a535cd943fc/go.mod h1:CfZSN7zwz5gJiFhZJz49Uzk7mEBHIceWmbFmYx7Hf7E= -github.com/masterzen/winrm v0.0.0-20211231115050-232efb40349e/go.mod h1:Iju3u6NzoTAvjuhsGCZc+7fReNnr/Bd6DsWj3WTokIU= -github.com/masterzen/xmlpath v0.0.0-20140218185901-13f4951698ad/go.mod h1:A0zPC53iKKKcXYxr4ROjpQRQ5FgJXtelNdSmHHuq/tY= github.com/mattn/go-colorable v0.0.6/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.0-20160806122752-66b8e73f3f5c/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= -golang.org/x/crypto v0.0.0-20180214000028-650f4a345ab4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180406214816-61147c48b25b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20160105164936-4f90aeace3a2/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v1 v1.0.0-20161222125816-442357a80af5/go.mod h1:u0ALmqvLRxLI95fkdCEWrE6mhWYZW1aMOJHp5YXLHTg= -gopkg.in/httprequest.v1 v1.1.1/go.mod h1:/CkavNL+g3qLOrpFHVrEx4NKepeqR4XTZWNj4sGGjz0= -gopkg.in/mgo.v2 v2.0.0-20160818015218-f2b6f6c918c4/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod h1:BHsqpu/nsuzkT5BpiH1EMZPLyqSMM8JbIavyFACoFNk= -gopkg.in/yaml.v2 v2.0.0-20170712054546-1be3d31502d6/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM= -launchpad.net/xmlpath v0.0.0-20130614043138-000000000004/go.mod h1:vqyExLOM3qBx7mvYRkoxjSCF945s0mbe7YynlKYXtsA= From 3e84d38745eb446ea47e51e70b0059457fad6945 Mon Sep 17 00:00:00 2001 From: Jack Shaw Date: Mon, 15 Apr 2024 13:10:26 +0100 Subject: [PATCH 2/2] Bump version to v3 --- Makefile | 2 +- commands/apt.go | 2 +- commands/apt_test.go | 2 +- commands/snap_test.go | 2 +- commands/yum_test.go | 2 +- commands/zypper_test.go | 2 +- config/apt_test.go | 2 +- config/configurer_apt.go | 2 +- config/configurer_yum.go | 2 +- config/configurer_zypper.go | 2 +- config/constants_test.go | 2 +- config/interface.go | 2 +- config/interface_test.go | 2 +- config/yum_test.go | 2 +- config/zypper_test.go | 2 +- go.mod | 2 +- manager/apt.go | 2 +- manager/apt_test.go | 4 ++-- manager/manager.go | 2 +- manager/manager_test.go | 4 ++-- manager/run_test.go | 2 +- manager/snap.go | 2 +- manager/snap_test.go | 4 ++-- manager/testing/interface_test.go | 4 ++-- manager/yum.go | 2 +- manager/yum_test.go | 4 ++-- manager/zypper.go | 2 +- manager/zypper_test.go | 4 ++-- 28 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 8ee5679..de1197b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PROJECT := github.com/juju/packaging/v2 +PROJECT := github.com/juju/packaging/v3 .PHONY: check-licence check-go check diff --git a/commands/apt.go b/commands/apt.go index cecb947..9ac8185 100644 --- a/commands/apt.go +++ b/commands/apt.go @@ -4,7 +4,7 @@ package commands -import "github.com/juju/packaging/v2/config" +import "github.com/juju/packaging/v3/config" const ( // AptConfFilePath is the full file path for the proxy settings that are diff --git a/commands/apt_test.go b/commands/apt_test.go index 2aa00db..f3876c1 100644 --- a/commands/apt_test.go +++ b/commands/apt_test.go @@ -10,7 +10,7 @@ import ( "github.com/juju/proxy" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/commands" + "github.com/juju/packaging/v3/commands" ) var _ = gc.Suite(&AptSuite{}) diff --git a/commands/snap_test.go b/commands/snap_test.go index c0a8b99..621d47c 100644 --- a/commands/snap_test.go +++ b/commands/snap_test.go @@ -7,7 +7,7 @@ import ( "github.com/juju/proxy" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/commands" + "github.com/juju/packaging/v3/commands" ) var _ = gc.Suite(&SnapSuite{}) diff --git a/commands/yum_test.go b/commands/yum_test.go index 8c2eff7..d2e8721 100644 --- a/commands/yum_test.go +++ b/commands/yum_test.go @@ -8,7 +8,7 @@ import ( "github.com/juju/proxy" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/commands" + "github.com/juju/packaging/v3/commands" ) var _ = gc.Suite(&YumSuite{}) diff --git a/commands/zypper_test.go b/commands/zypper_test.go index b1b81b1..36588f6 100644 --- a/commands/zypper_test.go +++ b/commands/zypper_test.go @@ -8,7 +8,7 @@ import ( "github.com/juju/proxy" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/commands" + "github.com/juju/packaging/v3/commands" ) var _ = gc.Suite(&ZypperSuite{}) diff --git a/config/apt_test.go b/config/apt_test.go index ef1a6fd..cbfb03a 100644 --- a/config/apt_test.go +++ b/config/apt_test.go @@ -8,7 +8,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/config" + "github.com/juju/packaging/v3/config" ) var _ = gc.Suite(&AptSuite{}) diff --git a/config/configurer_apt.go b/config/configurer_apt.go index 9f83b26..7bf554c 100644 --- a/config/configurer_apt.go +++ b/config/configurer_apt.go @@ -5,7 +5,7 @@ package config import ( - "github.com/juju/packaging/v2" + "github.com/juju/packaging/v3" ) // aptConfigurer is the PackagingConfigurer implementation for apt-based systems. diff --git a/config/configurer_yum.go b/config/configurer_yum.go index f025fa7..30b306c 100644 --- a/config/configurer_yum.go +++ b/config/configurer_yum.go @@ -5,7 +5,7 @@ package config import ( - "github.com/juju/packaging/v2" + "github.com/juju/packaging/v3" ) // yumConfigurer is the PackagingConfigurer implementation for apt-based systems. diff --git a/config/configurer_zypper.go b/config/configurer_zypper.go index c7150bb..8aa0569 100644 --- a/config/configurer_zypper.go +++ b/config/configurer_zypper.go @@ -5,7 +5,7 @@ package config import ( - "github.com/juju/packaging/v2" + "github.com/juju/packaging/v3" ) // yumConfigurer is the PackagingConfigurer implementation for apt-based systems. diff --git a/config/constants_test.go b/config/constants_test.go index f6a0b33..f292ad0 100644 --- a/config/constants_test.go +++ b/config/constants_test.go @@ -4,7 +4,7 @@ package config_test -import "github.com/juju/packaging/v2" +import "github.com/juju/packaging/v3" var ( testedSource = packaging.PackageSource{ diff --git a/config/interface.go b/config/interface.go index 322e86b..f94dad8 100644 --- a/config/interface.go +++ b/config/interface.go @@ -8,7 +8,7 @@ package config import ( - "github.com/juju/packaging/v2" + "github.com/juju/packaging/v3" ) // PackagingConfigurer is an interface which handles various packaging-related configuration diff --git a/config/interface_test.go b/config/interface_test.go index c3c344c..b7b4f08 100644 --- a/config/interface_test.go +++ b/config/interface_test.go @@ -5,7 +5,7 @@ package config_test import ( - "github.com/juju/packaging/v2/config" + "github.com/juju/packaging/v3/config" ) var _ config.PackagingConfigurer = config.NewAptPackagingConfigurer() diff --git a/config/yum_test.go b/config/yum_test.go index d167b75..5b73aa2 100644 --- a/config/yum_test.go +++ b/config/yum_test.go @@ -8,7 +8,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/config" + "github.com/juju/packaging/v3/config" ) var _ = gc.Suite(&YumSuite{}) diff --git a/config/zypper_test.go b/config/zypper_test.go index b6ccc79..5c71472 100644 --- a/config/zypper_test.go +++ b/config/zypper_test.go @@ -7,7 +7,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/config" + "github.com/juju/packaging/v3/config" ) var _ = gc.Suite(&ZypperSuite{}) diff --git a/go.mod b/go.mod index f91934f..c2aad29 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/juju/packaging/v2 +module github.com/juju/packaging/v3 go 1.21 diff --git a/manager/apt.go b/manager/apt.go index 39f2cc7..12a3387 100644 --- a/manager/apt.go +++ b/manager/apt.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/juju/errors" - "github.com/juju/packaging/v2/commands" + "github.com/juju/packaging/v3/commands" "github.com/juju/proxy" ) diff --git a/manager/apt_test.go b/manager/apt_test.go index ed97fac..d370b48 100644 --- a/manager/apt_test.go +++ b/manager/apt_test.go @@ -12,8 +12,8 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/commands" - "github.com/juju/packaging/v2/manager" + "github.com/juju/packaging/v3/commands" + "github.com/juju/packaging/v3/manager" ) var _ = gc.Suite(&AptSuite{}) diff --git a/manager/manager.go b/manager/manager.go index 1b8aae7..3cfec59 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -10,7 +10,7 @@ import ( "github.com/juju/proxy" - "github.com/juju/packaging/v2/commands" + "github.com/juju/packaging/v3/commands" ) // basePackageManager is the struct which executes various diff --git a/manager/manager_test.go b/manager/manager_test.go index 1a2d1dc..1a52bb3 100644 --- a/manager/manager_test.go +++ b/manager/manager_test.go @@ -13,8 +13,8 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/commands" - "github.com/juju/packaging/v2/manager" + "github.com/juju/packaging/v3/commands" + "github.com/juju/packaging/v3/manager" ) var _ = gc.Suite(&ManagerSuite{}) diff --git a/manager/run_test.go b/manager/run_test.go index d35e60c..a7690a9 100644 --- a/manager/run_test.go +++ b/manager/run_test.go @@ -12,7 +12,7 @@ import ( "github.com/juju/testing" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/manager" + "github.com/juju/packaging/v3/manager" ) var _ = gc.Suite(&RunSuite{}) diff --git a/manager/snap.go b/manager/snap.go index aa03b4f..b63a1cc 100644 --- a/manager/snap.go +++ b/manager/snap.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/juju/errors" - "github.com/juju/packaging/v2/commands" + "github.com/juju/packaging/v3/commands" "github.com/juju/proxy" ) diff --git a/manager/snap_test.go b/manager/snap_test.go index 11fe70d..9499f7a 100644 --- a/manager/snap_test.go +++ b/manager/snap_test.go @@ -13,8 +13,8 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/commands" - "github.com/juju/packaging/v2/manager" + "github.com/juju/packaging/v3/commands" + "github.com/juju/packaging/v3/manager" ) var ( diff --git a/manager/testing/interface_test.go b/manager/testing/interface_test.go index c7fcb9b..b215f03 100644 --- a/manager/testing/interface_test.go +++ b/manager/testing/interface_test.go @@ -5,8 +5,8 @@ package testing_test import ( - "github.com/juju/packaging/v2/manager" - "github.com/juju/packaging/v2/manager/testing" + "github.com/juju/packaging/v3/manager" + "github.com/juju/packaging/v3/manager/testing" ) var _ manager.PackageManager = &testing.MockPackageManager{} diff --git a/manager/yum.go b/manager/yum.go index e90b222..d60eab8 100644 --- a/manager/yum.go +++ b/manager/yum.go @@ -9,7 +9,7 @@ import ( "os/exec" "strings" - "github.com/juju/packaging/v2/commands" + "github.com/juju/packaging/v3/commands" "github.com/juju/proxy" ) diff --git a/manager/yum_test.go b/manager/yum_test.go index d5baada..f577b19 100644 --- a/manager/yum_test.go +++ b/manager/yum_test.go @@ -12,8 +12,8 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/commands" - "github.com/juju/packaging/v2/manager" + "github.com/juju/packaging/v3/commands" + "github.com/juju/packaging/v3/manager" ) var _ = gc.Suite(&YumSuite{}) diff --git a/manager/zypper.go b/manager/zypper.go index 7f39efe..4053ec0 100644 --- a/manager/zypper.go +++ b/manager/zypper.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "github.com/juju/packaging/v2/commands" + "github.com/juju/packaging/v3/commands" "github.com/juju/proxy" ) diff --git a/manager/zypper_test.go b/manager/zypper_test.go index d8dd015..27665ca 100644 --- a/manager/zypper_test.go +++ b/manager/zypper_test.go @@ -11,8 +11,8 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "github.com/juju/packaging/v2/commands" - "github.com/juju/packaging/v2/manager" + "github.com/juju/packaging/v3/commands" + "github.com/juju/packaging/v3/manager" ) var _ = gc.Suite(&ZypperSuite{})