Merge pull request #1848 from cappyzawa/refactor/transport-to-pkg

stefanprodan · web-flow · commit 21e3a02f99f3 · 2025-07-09T14:18:21.000+03:00
refactor: replace internal/transport with pkg/http/transport
diff --git a/go.mod b/go.mod
@@ -34,6 +34,7 @@ require (
 	github.com/fluxcd/pkg/git/gogit v0.35.1
 	github.com/fluxcd/pkg/gittestserver v0.17.0
 	github.com/fluxcd/pkg/helmtestserver v0.24.0
+	github.com/fluxcd/pkg/http/transport v0.6.0
 	github.com/fluxcd/pkg/lockedfile v0.6.0
 	github.com/fluxcd/pkg/masktoken v0.7.0
 	github.com/fluxcd/pkg/oci v0.49.0
diff --git a/go.sum b/go.sum
@@ -385,6 +385,8 @@ github.com/fluxcd/pkg/gittestserver v0.17.0 h1:JlBvWZQTDOI+np5Z+084m3DkeAH1hMusE
 github.com/fluxcd/pkg/gittestserver v0.17.0/go.mod h1:E/40EmLoXcMqd6gLuLDC9F6KJxqHVGbBBeMNKk5XdxU=
 github.com/fluxcd/pkg/helmtestserver v0.24.0 h1:9sSfRG17GnDIup4sI8V+fdvKROtunU4JyIo34uvXq3Q=
 github.com/fluxcd/pkg/helmtestserver v0.24.0/go.mod h1:jMCCzTV9r3N+0kD8Uo09nbgQ1iTaw54LFKKMlztlBhs=
+github.com/fluxcd/pkg/http/transport v0.6.0 h1:ryzy81tpNYWZ/qsDd3tLdO6Bfn1wYLI1zdbepPBY/mo=
+github.com/fluxcd/pkg/http/transport v0.6.0/go.mod h1:95TBlrNsDdKMDCKvJnne2VC3SuZ5/JIj+r/yssaXz4w=
 github.com/fluxcd/pkg/lockedfile v0.6.0 h1:64RRMiPv3ZK9Y4sjI8c78kZAdfEo+Sjr2iP8a9pZeZo=
 github.com/fluxcd/pkg/lockedfile v0.6.0/go.mod h1:gpdUVm7+05NIT1ZvzuNnHfnT81OhZtIySlxxkZ68pXk=
 github.com/fluxcd/pkg/masktoken v0.7.0 h1:pitmyOg2pUVdW+nn2Lk/xqm2TaA08uxvOC0ns3sz6bM=
diff --git a/internal/helm/repository/chart_repository.go b/internal/helm/repository/chart_repository.go
@@ -40,9 +40,9 @@ import (
 
 	"github.com/fluxcd/pkg/version"
 
+	"github.com/fluxcd/pkg/http/transport"
 	"github.com/fluxcd/source-controller/internal/helm"
 	"github.com/fluxcd/source-controller/internal/oci"
-	"github.com/fluxcd/source-controller/internal/transport"
 )
 
 var (
diff --git a/internal/helm/repository/oci_chart_repository.go b/internal/helm/repository/oci_chart_repository.go
@@ -36,9 +36,9 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/google/go-containerregistry/pkg/name"
 
+	"github.com/fluxcd/pkg/http/transport"
 	"github.com/fluxcd/pkg/version"
 	"github.com/fluxcd/source-controller/internal/oci"
-	"github.com/fluxcd/source-controller/internal/transport"
 )
 
 // RegistryClient is an interface for interacting with OCI registries
diff --git a/internal/transport/transport.go b/internal/transport/transport.go
diff --git a/internal/transport/transport_test.go b/internal/transport/transport_test.go

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,9 @@ import (`
`40`	`40`
`41`	`41`	`"github.com/fluxcd/pkg/version"`
`42`	`42`
	`43`	`+ "github.com/fluxcd/pkg/http/transport"`
`43`	`44`	`"github.com/fluxcd/source-controller/internal/helm"`
`44`	`45`	`"github.com/fluxcd/source-controller/internal/oci"`
`45`		`- "github.com/fluxcd/source-controller/internal/transport"`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ import (`
`36`	`36`	`"github.com/Masterminds/semver/v3"`
`37`	`37`	`"github.com/google/go-containerregistry/pkg/name"`
`38`	`38`
	`39`	`+ "github.com/fluxcd/pkg/http/transport"`
`39`	`40`	`"github.com/fluxcd/pkg/version"`
`40`	`41`	`"github.com/fluxcd/source-controller/internal/oci"`
`41`		`- "github.com/fluxcd/source-controller/internal/transport"`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`// RegistryClient is an interface for interacting with OCI registries`