Merge pull request #6017 from irbekrm/importable_webhook_tests

Make external DNS webhook tests importable again

test/acme/fixture.go

@@ -27,8 +27,8 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
-	"github.com/cert-manager/cert-manager/integration-tests/internal/apiserver"
 	"github.com/cert-manager/cert-manager/pkg/acme/webhook"
+	"github.com/cert-manager/cert-manager/test/apiserver"
 )
 
 func init() {

test/acme/server/rfc2136.go

@@ -21,10 +21,10 @@ import (
 	"sync"
 	"time"
 
-	logf "github.com/cert-manager/cert-manager/pkg/logs"
-
 	"github.com/go-logr/logr"
 	"github.com/miekg/dns"
+
+	logf "github.com/cert-manager/cert-manager/pkg/logs"
 )
 
 type rfc2136Handler struct {

test/acme/util.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// package dns contains a framework for testing ACME DNS solver implementations.
+// Used by both internal and external solvers.
 package dns
 
 import (

test/apiserver/apiserver.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// package apiserver contains functionality to set up a Kubernetes control plane
+// for tests.
 package apiserver
 
 import (

test/integration/ctl/install_framework/framework.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
-	"github.com/cert-manager/cert-manager/integration-tests/internal/apiserver"
+	"github.com/cert-manager/cert-manager/test/apiserver"
 )
 
 type TestInstallApiServer struct {

test/integration/framework/apiserver.go

@@ -38,11 +38,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
-	"github.com/cert-manager/cert-manager/integration-tests/internal/apiserver"
 	"github.com/cert-manager/cert-manager/internal/test/paths"
 	"github.com/cert-manager/cert-manager/internal/webhook"
 	"github.com/cert-manager/cert-manager/pkg/api"
 	"github.com/cert-manager/cert-manager/pkg/webhook/handlers"
+	"github.com/cert-manager/cert-manager/test/apiserver"
 	webhooktesting "github.com/cert-manager/cert-manager/webhook-binary/app/testing"
 )
 

test/integration/rfc2136_dns01/provider_test.go

@@ -22,12 +22,12 @@ import (
 
 	logtesting "github.com/go-logr/logr/testing"
 
-	dns "github.com/cert-manager/cert-manager/integration-tests/acmedns"
-	testserver "github.com/cert-manager/cert-manager/integration-tests/acmedns/server"
 	cmacme "github.com/cert-manager/cert-manager/pkg/apis/acme/v1"
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
 	"github.com/cert-manager/cert-manager/pkg/issuer/acme/dns/rfc2136"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
+	dns "github.com/cert-manager/cert-manager/test/acme"
+	testserver "github.com/cert-manager/cert-manager/test/acme/server"
 )
 
 func TestRunSuiteWithTSIG(t *testing.T) {

test/integration/rfc2136_dns01/rfc2136_test.go

@@ -33,9 +33,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	testserver "github.com/cert-manager/cert-manager/integration-tests/acmedns/server"
 	"github.com/cert-manager/cert-manager/pkg/issuer/acme/dns/rfc2136"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
+	testserver "github.com/cert-manager/cert-manager/test/acme/server"
 )
 
 var (