Merge pull request #31216 from mattfarina/move-to-versions

Move to versioned packages
pull/13414/merge
Matt Farina 2 days ago committed by GitHub
commit 05ce1990d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -33,7 +33,7 @@ import (
"helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/provenance"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
// Resolver resolves dependencies from semantic version ranges to a particular version.

@ -45,8 +45,8 @@ import (
"helm.sh/helm/v4/pkg/kube"
"helm.sh/helm/v4/pkg/postrenderer"
"helm.sh/helm/v4/pkg/registry"
releaseutil "helm.sh/helm/v4/pkg/release/util"
release "helm.sh/helm/v4/pkg/release/v1"
releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
"helm.sh/helm/v4/pkg/storage"
"helm.sh/helm/v4/pkg/storage/driver"
"helm.sh/helm/v4/pkg/time"

@ -50,9 +50,9 @@ import (
kubefake "helm.sh/helm/v4/pkg/kube/fake"
"helm.sh/helm/v4/pkg/postrenderer"
"helm.sh/helm/v4/pkg/registry"
releaseutil "helm.sh/helm/v4/pkg/release/util"
release "helm.sh/helm/v4/pkg/release/v1"
"helm.sh/helm/v4/pkg/repo"
releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
"helm.sh/helm/v4/pkg/repo/v1"
"helm.sh/helm/v4/pkg/storage"
"helm.sh/helm/v4/pkg/storage/driver"
)

@ -22,8 +22,8 @@ import (
"k8s.io/apimachinery/pkg/labels"
releaseutil "helm.sh/helm/v4/pkg/release/util"
release "helm.sh/helm/v4/pkg/release/v1"
releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
)
// ListStates represents zero or more status codes that a list item may have set

@ -27,7 +27,7 @@ import (
"helm.sh/helm/v4/pkg/downloader"
"helm.sh/helm/v4/pkg/getter"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
// Pull is the action for checking a given release's information.

@ -20,7 +20,7 @@ import (
"strings"
"helm.sh/helm/v4/pkg/kube"
releaseutil "helm.sh/helm/v4/pkg/release/util"
releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
)
func filterManifestsToKeep(manifests []releaseutil.Manifest) (keep, remaining []releaseutil.Manifest) {

@ -27,8 +27,8 @@ import (
chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/kube"
releaseutil "helm.sh/helm/v4/pkg/release/util"
release "helm.sh/helm/v4/pkg/release/v1"
releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
"helm.sh/helm/v4/pkg/storage/driver"
helmtime "helm.sh/helm/v4/pkg/time"
)

@ -33,8 +33,8 @@ import (
"helm.sh/helm/v4/pkg/kube"
"helm.sh/helm/v4/pkg/postrenderer"
"helm.sh/helm/v4/pkg/registry"
releaseutil "helm.sh/helm/v4/pkg/release/util"
release "helm.sh/helm/v4/pkg/release/v1"
releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
"helm.sh/helm/v4/pkg/storage/driver"
)

@ -24,8 +24,8 @@ import (
chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/provenance"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
func TestDependencyBuildCmd(t *testing.T) {

@ -29,8 +29,8 @@ import (
chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/provenance"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
func TestDependencyUpdateCmd(t *testing.T) {

@ -37,7 +37,7 @@ import (
"helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/kube"
"helm.sh/helm/v4/pkg/postrenderer"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
const (

@ -29,8 +29,8 @@ import (
chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/cli/output"
"helm.sh/helm/v4/pkg/cmd/require"
releaseutil "helm.sh/helm/v4/pkg/release/util"
release "helm.sh/helm/v4/pkg/release/v1"
releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
helmtime "helm.sh/helm/v4/pkg/time"
)

@ -23,7 +23,7 @@ import (
"path/filepath"
"testing"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
func TestInstall(t *testing.T) {

@ -24,7 +24,7 @@ import (
"path/filepath"
"testing"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
func TestPullCmd(t *testing.T) {

@ -34,7 +34,7 @@ import (
"helm.sh/helm/v4/pkg/cmd/require"
"helm.sh/helm/v4/pkg/getter"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
// Repositories that have been permanently deleted and no longer work

@ -31,8 +31,8 @@ import (
"helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/helmpath/xdg"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
func TestRepoAddCmd(t *testing.T) {

@ -27,7 +27,7 @@ import (
"github.com/spf13/cobra"
"helm.sh/helm/v4/pkg/cmd/require"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
const repoIndexDesc = `

@ -24,7 +24,7 @@ import (
"path/filepath"
"testing"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
func TestRepoIndexCmd(t *testing.T) {

@ -25,7 +25,7 @@ import (
"helm.sh/helm/v4/pkg/cli/output"
"helm.sh/helm/v4/pkg/cmd/require"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
func newRepoListCmd(out io.Writer) *cobra.Command {

@ -28,7 +28,7 @@ import (
"helm.sh/helm/v4/pkg/cmd/require"
"helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
type repoRemoveOptions struct {

@ -25,8 +25,8 @@ import (
"testing"
"helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
func TestRepoRemove(t *testing.T) {

@ -28,7 +28,7 @@ import (
"helm.sh/helm/v4/pkg/cmd/require"
"helm.sh/helm/v4/pkg/getter"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
const updateDesc = `

@ -26,8 +26,8 @@ import (
"helm.sh/helm/v4/internal/test/ensure"
"helm.sh/helm/v4/pkg/getter"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
func TestUpdateCmd(t *testing.T) {

@ -40,7 +40,7 @@ import (
kubefake "helm.sh/helm/v4/pkg/kube/fake"
"helm.sh/helm/v4/pkg/registry"
release "helm.sh/helm/v4/pkg/release/v1"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
"helm.sh/helm/v4/pkg/storage/driver"
)

@ -31,7 +31,7 @@ import (
"github.com/Masterminds/semver/v3"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
// Result is a search result.

@ -21,7 +21,7 @@ import (
"testing"
chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
func TestSortScore(t *testing.T) {

@ -34,7 +34,7 @@ import (
"helm.sh/helm/v4/pkg/cli/output"
"helm.sh/helm/v4/pkg/cmd/search"
"helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
const searchRepoDesc = `

@ -22,7 +22,7 @@ import (
"strings"
"testing"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
func TestShowPreReleaseChart(t *testing.T) {

@ -38,7 +38,7 @@ import (
chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/cli/values"
"helm.sh/helm/v4/pkg/cmd/require"
releaseutil "helm.sh/helm/v4/pkg/release/util"
releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
)
const templateDesc = `

@ -36,7 +36,7 @@ import (
"helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/provenance"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
// VerificationStrategy describes a strategy for determining whether to verify a chart.

@ -28,8 +28,8 @@ import (
"helm.sh/helm/v4/pkg/cli"
"helm.sh/helm/v4/pkg/getter"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
const (

@ -42,7 +42,7 @@ import (
"helm.sh/helm/v4/pkg/getter"
"helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
// ErrRepoNotFound indicates that chart repositories can't be found in local repo cache.

@ -32,8 +32,8 @@ import (
"helm.sh/helm/v4/pkg/chart/v2/loader"
chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/getter"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/repotest"
"helm.sh/helm/v4/pkg/repo/v1"
"helm.sh/helm/v4/pkg/repo/v1/repotest"
)
func TestVersionEquals(t *testing.T) {

@ -231,7 +231,7 @@ func testPush(suite *TestSuite) {
suite.NotNil(err, "error pushing non-chart bytes")
// Load a test chart
chartData, err := os.ReadFile("../repo/repotest/testdata/examplechart-0.1.0.tgz")
chartData, err := os.ReadFile("../repo/v1/repotest/testdata/examplechart-0.1.0.tgz")
suite.Nil(err, "no error loading test chart")
meta, err := extractChartMeta(chartData)
suite.Nil(err, "no error extracting chart meta")

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package util // import "helm.sh/helm/v4/pkg/release/util"
package util // import "helm.sh/helm/v4/pkg/release/v1/util"
import rspb "helm.sh/helm/v4/pkg/release/v1"

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package util // import "helm.sh/helm/v4/pkg/release/util"
package util // import "helm.sh/helm/v4/pkg/release/v1/util"
import (
"testing"

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package util // import "helm.sh/helm/v4/pkg/release/util"
package util // import "helm.sh/helm/v4/pkg/release/v1/util"
import (
"reflect"

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package util // import "helm.sh/helm/v4/pkg/release/util"
package util // import "helm.sh/helm/v4/pkg/release/v1/util"
import (
"sort"

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package util // import "helm.sh/helm/v4/pkg/release/util"
package util // import "helm.sh/helm/v4/pkg/release/v1/util"
import (
"testing"

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package repo // import "helm.sh/helm/v4/pkg/repo"
package repo // import "helm.sh/helm/v4/pkg/repo/v1"
import (
"crypto/rand"

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package repo // import "helm.sh/helm/v4/pkg/repo"
package repo // import "helm.sh/helm/v4/pkg/repo/v1"
import (
"fmt"

@ -37,7 +37,7 @@ import (
"helm.sh/helm/v4/pkg/chart/v2/loader"
chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
ociRegistry "helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
func BasicAuthMiddleware(t *testing.T) http.HandlerFunc {

@ -25,7 +25,7 @@ import (
"sigs.k8s.io/yaml"
"helm.sh/helm/v4/internal/test/ensure"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/v1"
)
// Young'n, in these here parts, we test our tests.
@ -113,7 +113,7 @@ func TestNewTempServer(t *testing.T) {
"tls": {
options: []ServerOption{
WithChartSourceGlob("testdata/examplechart-0.1.0.tgz"),
WithTLSConfig(MakeTestTLSConfig(t, "../../../testdata")),
WithTLSConfig(MakeTestTLSConfig(t, "../../../../testdata")),
},
},
}
@ -212,7 +212,7 @@ func TestNewTempServer_TLS(t *testing.T) {
srv := NewTempServer(
t,
WithChartSourceGlob("testdata/examplechart-0.1.0.tgz"),
WithTLSConfig(MakeTestTLSConfig(t, "../../../testdata")),
WithTLSConfig(MakeTestTLSConfig(t, "../../../../testdata")),
)
defer srv.Stop()

@ -22,8 +22,8 @@ import (
"log/slog"
"strings"
relutil "helm.sh/helm/v4/pkg/release/util"
rspb "helm.sh/helm/v4/pkg/release/v1"
relutil "helm.sh/helm/v4/pkg/release/v1/util"
"helm.sh/helm/v4/pkg/storage/driver"
)

Loading…
Cancel
Save