Reorganize Porch packages (#3069)

* align closer with canonical golang repository structure
* remove hack directory
* remove unnecessary directory nesting (`engine/pkg/`, `repository/pkg/`)

.github/workflows/porch-e2e.yml

@@ -96,6 +96,6 @@ jobs:
           done
       - name: e2e test
         run: go test -v .
-        working-directory: ./porch/apiserver/pkg/e2e
+        working-directory: ./porch/test/e2e
       - name: Porch CLI e2e test
         run: make test-porch

.github/workflows/porch.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Run Porch Unit Tests
         uses: actions/checkout@v2
       - name: Verify format / headers etc
-        run: hack/verify-fix-all.sh
+        run: scripts/verify-fix-all.sh
         working-directory: ./porch
       - name: Build
         run: make porch

porch/.vscode/launch.json

@@ -20,12 +20,12 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "${workspaceFolder}/apiserver/cmd/porch/main.go",
+            "program": "${workspaceFolder}/cmd/porch/main.go",
             "args": [
                 "--secure-port=9443",
                 "--v=7",
                 "--standalone-debug-mode",
-                "--kubeconfig=${workspaceFolder}/hack/local/kubeconfig",
+                "--kubeconfig=${workspaceFolder}/deployments/local/kubeconfig",
                 "--cache-directory=${workspaceFolder}/.cache",
                 "--function-runner=192.168.8.202:9445"
             ],

porch/Makefile

@@ -12,15 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-KUBECONFIG=$(CURDIR)/hack/local/kubeconfig
+KUBECONFIG=$(CURDIR)/deployments/local/kubeconfig
 BUILDDIR=$(CURDIR)/.build
 CACHEDIR=$(CURDIR)/.cache
 DEPLOYCONFIGDIR=$(BUILDDIR)/deploy
 DEPLOYCONFIG_NO_SA_DIR=$(BUILDDIR)/deploy-no-sa
+KPTDIR=$(abspath $(CURDIR)/..)
 
 # Modules are ordered in dependency order. A module precedes modules that depend on it.
 MODULES = \
- config/samples/apps/hello-server \
+ examples/apps/hello-server \
  api \
  . \
 
@@ -54,7 +55,7 @@ stop:
 
 .PHONY: start-etcd
 start-etcd:
-	docker buildx build -t etcd --output=type=docker hack/local/etcd
+	docker buildx build -t etcd --output=type=docker -f ./build/Dockerfile.etcd ./build
 	mkdir -p $(BUILDDIR)/data/etcd
 	docker stop etcd || true
 	docker rm etcd || true
@@ -66,10 +67,10 @@ start-etcd:
 
 .PHONY: start-kube-apiserver
 start-kube-apiserver:
-	docker buildx build -t kube-apiserver --output=type=docker hack/local/kube-apiserver
+	docker buildx build -t kube-apiserver --output=type=docker -f ./build/Dockerfile.apiserver ./build
 	docker stop kube-apiserver || true
 	docker rm kube-apiserver || true
-	hack/local/makekeys.sh
+	deployments/local/makekeys.sh
 	docker run --detach --user `id -u`:`id -g` \
 	  --network=porch \
 	  --ip 192.168.8.201 \
@@ -123,7 +124,7 @@ PORCH = $(BUILDDIR)/porch
 
 .PHONY: run-local
 run-local: porch
-	KUBECONFIG=$(KUBECONFIG) kubectl apply -f hack/local/localconfig.yaml
+	KUBECONFIG=$(KUBECONFIG) kubectl apply -f deployments/local/localconfig.yaml
 	KUBECONFIG=$(KUBECONFIG) kubectl apply -f api/porchconfig/v1alpha1/
 	$(PORCH) \
 	--secure-port 9443 \
@@ -138,7 +139,7 @@ run-jaeger:
 
 .PHONY: porch
 porch:
-	cd apiserver; go build -o $(PORCH) ./cmd/porch
+	go build -o $(PORCH) ./cmd/porch
 
 .PHONY: fix-headers
 fix-headers:
@@ -150,14 +151,14 @@ fix-all: fix-headers fmt tidy
 
 .PHONY: push-images
 push-images:
-	IMAGE_NAME="$(PORCH_SERVER_IMAGE)" make -C apiserver/ push-image
+	docker buildx build --push --tag $(IMAGE_REPO)/$(PORCH_SERVER_IMAGE):$(IMAGE_TAG) -f ./build/Dockerfile.porch "$(KPTDIR)"
 	IMAGE_NAME="$(PORCH_CONTROLLERS_IMAGE)" make -C controllers/ push-image
 	IMAGE_NAME="$(PORCH_FUNCTION_RUNNER_IMAGE)" WRAPPER_SERVER_IMAGE_NAME="$(PORCH_WRAPPER_SERVER_IMAGE)" make -C func/ push-image
 	IMAGE_NAME="$(TEST_GIT_SERVER_IMAGE)" make -C test/ push-image
 
 .PHONY: build-images
 build-images:
-	IMAGE_NAME="$(PORCH_SERVER_IMAGE)" make -C apiserver/ build-image
+	docker buildx build --load --tag $(IMAGE_REPO)/$(PORCH_SERVER_IMAGE):$(IMAGE_TAG) -f ./build/Dockerfile.porch "$(KPTDIR)"
 	IMAGE_NAME="$(PORCH_CONTROLLERS_IMAGE)" make -C controllers/ build-image
 	IMAGE_NAME="$(PORCH_FUNCTION_RUNNER_IMAGE)" WRAPPER_SERVER_IMAGE_NAME="$(PORCH_WRAPPER_SERVER_IMAGE)" make -C func/ build-image
 	IMAGE_NAME="$(TEST_GIT_SERVER_IMAGE)" make -C test/ build-image
@@ -182,7 +183,7 @@ apply-dev-config:
 deployment-config:
 	rm -rf $(DEPLOYCONFIGDIR) || true
 	mkdir -p $(DEPLOYCONFIGDIR)
-	./hack/create-deployment-blueprint.sh \
+	./scripts/create-deployment-blueprint.sh \
 	  --destination "$(DEPLOYCONFIGDIR)" \
 	  --server-image "$(IMAGE_REPO)/$(PORCH_SERVER_IMAGE):$(IMAGE_TAG)" \
 	  --controllers-image "$(IMAGE_REPO)/$(PORCH_CONTROLLERS_IMAGE):$(IMAGE_TAG)" \
@@ -207,7 +208,7 @@ push-and-deploy: push-images deploy
 deployment-config-no-sa:
 	rm -rf $(DEPLOYCONFIG_NO_SA_DIR) || true
 	mkdir -p $(DEPLOYCONFIG_NO_SA_DIR)
-	./hack/create-deployment-blueprint.sh \
+	./scripts/create-deployment-blueprint.sh \
 	  --destination "$(DEPLOYCONFIG_NO_SA_DIR)" \
 	  --server-image "$(IMAGE_REPO)/$(PORCH_SERVER_IMAGE):$(IMAGE_TAG)" \
 	  --controllers-image "$(IMAGE_REPO)/$(PORCH_CONTROLLERS_IMAGE):$(IMAGE_TAG)" \

porch/README.md

@@ -120,7 +120,7 @@ sure that the service account has appropriate level of access to your OCI reposi
 Once you have one or more repositories registered, you can list the package revisions:
 
 ```sh
-export KUBECONFIG="${PWD}/hack/local/kubeconfig"
+export KUBECONFIG="${PWD}/deployments/local/kubeconfig"
 
 # List all package revisions
 kubectl get packagerevisions

porch/api/porch/doc.go

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run k8s.io/code-generator/cmd/deepcopy-gen --input-dirs ./... -O zz_generated.deepcopy --go-header-file ../../hack/boilerplate.go.txt
-//go:generate go run k8s.io/code-generator/cmd/openapi-gen --input-dirs github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 --input-dirs k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/version --output-package github.com/GoogleContainerTools/kpt/porch/api/generated/openapi -O zz_generated.openapi --go-header-file ../../hack/boilerplate.go.txt
+//go:generate go run k8s.io/code-generator/cmd/deepcopy-gen --input-dirs ./... -O zz_generated.deepcopy --go-header-file ../../scripts/boilerplate.go.txt
+//go:generate go run k8s.io/code-generator/cmd/openapi-gen --input-dirs github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 --input-dirs k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/version --output-package github.com/GoogleContainerTools/kpt/porch/api/generated/openapi -O zz_generated.openapi --go-header-file ../../scripts/boilerplate.go.txt
 
 // +k8s:deepcopy-gen=package,register
 // +groupName=porch.kpt.dev

porch/api/porch/v1alpha1/doc.go

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run k8s.io/code-generator/cmd/deepcopy-gen --input-dirs ./ -O zz_generated.deepcopy --go-header-file ../../../hack/boilerplate.go.txt
-//go:generate go run k8s.io/code-generator/cmd/defaulter-gen --input-dirs ./ -O zz_generated.defaults --go-header-file ../../../hack/boilerplate.go.txt
-//go:generate go run k8s.io/code-generator/cmd/client-gen --clientset-name versioned --input-base "" --input github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 --output-package github.com/GoogleContainerTools/kpt/porch/api/generated/clientset --plural-exceptions PackageRevisionResources:PackageRevisionResources --go-header-file ../../../hack/boilerplate.go.txt
-//go:generate go run k8s.io/code-generator/cmd/lister-gen --input-dirs github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 --output-package github.com/GoogleContainerTools/kpt/porch/api/generated/listers --go-header-file ../../../hack/boilerplate.go.txt
-//go:generate go run k8s.io/code-generator/cmd/informer-gen --input-dirs github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 --versioned-clientset-package github.com/GoogleContainerTools/kpt/porch/api/generated/clientset/versioned --listers-package github.com/GoogleContainerTools/kpt/porch/api/generated/listers --output-package github.com/GoogleContainerTools/kpt/porch/api/generated/informers --plural-exceptions PackageRevisionResources:PackageRevisionResources --go-header-file ../../../hack/boilerplate.go.txt
-//go:generate go run k8s.io/code-generator/cmd/conversion-gen --input-dirs github.com/GoogleContainerTools/kpt/porch/api/porch,github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 -O zz_generated.conversion --go-header-file ../../../hack/boilerplate.go.txt
+//go:generate go run k8s.io/code-generator/cmd/deepcopy-gen --input-dirs ./ -O zz_generated.deepcopy --go-header-file ../../../scripts/boilerplate.go.txt
+//go:generate go run k8s.io/code-generator/cmd/defaulter-gen --input-dirs ./ -O zz_generated.defaults --go-header-file ../../../scripts/boilerplate.go.txt
+//go:generate go run k8s.io/code-generator/cmd/client-gen --clientset-name versioned --input-base "" --input github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 --output-package github.com/GoogleContainerTools/kpt/porch/api/generated/clientset --plural-exceptions PackageRevisionResources:PackageRevisionResources --go-header-file ../../../scripts/boilerplate.go.txt
+//go:generate go run k8s.io/code-generator/cmd/lister-gen --input-dirs github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 --output-package github.com/GoogleContainerTools/kpt/porch/api/generated/listers --go-header-file ../../../scripts/boilerplate.go.txt
+//go:generate go run k8s.io/code-generator/cmd/informer-gen --input-dirs github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 --versioned-clientset-package github.com/GoogleContainerTools/kpt/porch/api/generated/clientset/versioned --listers-package github.com/GoogleContainerTools/kpt/porch/api/generated/listers --output-package github.com/GoogleContainerTools/kpt/porch/api/generated/informers --plural-exceptions PackageRevisionResources:PackageRevisionResources --go-header-file ../../../scripts/boilerplate.go.txt
+//go:generate go run k8s.io/code-generator/cmd/conversion-gen --input-dirs github.com/GoogleContainerTools/kpt/porch/api/porch,github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1 -O zz_generated.conversion --go-header-file ../../../scripts/boilerplate.go.txt
 
 // Api versions allow the api contract for a resource to be changed while keeping
 // backward compatibility by support multiple concurrent versions

porch/api/porchconfig/v1alpha1/groupversion_info.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 object object:headerFile="../../../hack/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 object object:headerFile="../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
 
 var (
 	// GroupVersion is group version used to register these objects

porch/apiserver/Dockerfile → porch/build/Dockerfile.porch

@@ -44,13 +44,12 @@ RUN cd porch; go build -v \
 COPY internal internal
 COPY pkg pkg
 COPY porch/api porch/api
-COPY porch/apiserver porch/apiserver
+COPY porch/cmd porch/cmd
+COPY porch/pkg porch/pkg
 COPY porch/controllers porch/controllers
-COPY porch/engine porch/engine
-COPY porch/repository porch/repository
 COPY porch/func porch/func
 
-RUN cd porch/apiserver; go build -v -o /porch ./cmd/porch
+RUN cd porch; go build -v -o /porch ./cmd/porch
 
 FROM debian:bullseye
 RUN apt update && apt install -y ca-certificates && rm -rf /var/lib/apt && rm -rf /var/cache/apt

porch/apiserver/cmd/porch/main.go → porch/cmd/porch/main.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/GoogleContainerTools/kpt/porch/apiserver/pkg/cmd/server"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/cmd/server"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/exporters/otlp"

porch/controllers/Dockerfile

@@ -42,7 +42,7 @@ COPY internal/ internal/
 COPY pkg/ pkg/
 COPY porch/api/ porch/api/
 COPY porch/controllers/ porch/controllers/
-COPY porch/repository/ porch/repository/
+COPY porch/pkg/ porch/pkg/
 
 WORKDIR /workspace/porch/controllers/remoterootsync/
 RUN CGO_ENABLED=0 go build -o /porch-controllers -v .

porch/controllers/remoterootsync/api/v1alpha1/groupversion_info.go

@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 object object:headerFile="../../../../hack/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects

porch/controllers/remoterootsync/pkg/controllers/remoterootsyncset/remoterootsync_controller.go

@@ -25,7 +25,7 @@ import (
 	api "github.com/GoogleContainerTools/kpt/porch/controllers/remoterootsync/api/v1alpha1"
 	"github.com/GoogleContainerTools/kpt/porch/controllers/remoterootsync/pkg/applyset"
 	"github.com/GoogleContainerTools/kpt/porch/controllers/remoterootsync/pkg/remoteclient"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/oci"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/oci"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

porch/docs/running-locally.md

@@ -82,7 +82,7 @@ main apiserver. Configure `kubectl` context to interact with the main k8s apiser
 Docker container:
 
 ```sh
-export KUBECONFIG=${PWD}/hack/local/kubeconfig
+export KUBECONFIG=${PWD}/deployments/local/kubeconfig
 
 # Confirm Porch is running
 kubectl api-resources | grep porch

porch/docs/running-on-gke.md

@@ -202,7 +202,7 @@ make apply-dev-config
 # Push a sample hello-world app
 make -C config/samples/apps/hello-server push-image
 # Create a package for the sample hello-world app
-./config/samples/create-deployment-package.sh
+./scripts/create-deployment-package.sh
 ```
 
 To test out remoterootsync self-applying:

porch/apiserver/pkg/apiserver/apiserver.go → porch/pkg/apiserver/apiserver.go

@@ -20,10 +20,10 @@ import (
 
 	"github.com/GoogleContainerTools/kpt/porch/api/porch/install"
 	configapi "github.com/GoogleContainerTools/kpt/porch/api/porchconfig/v1alpha1"
-	"github.com/GoogleContainerTools/kpt/porch/apiserver/pkg/registry/porch"
-	"github.com/GoogleContainerTools/kpt/porch/engine/pkg/engine"
-	"github.com/GoogleContainerTools/kpt/porch/engine/pkg/kpt"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/cache"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/cache"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/engine"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/kpt"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/registry/porch"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

porch/repository/pkg/cache/cache.go → porch/pkg/cache/cache.go

@@ -22,9 +22,9 @@ import (
 	"sync"
 
 	configapi "github.com/GoogleContainerTools/kpt/porch/api/porchconfig/v1alpha1"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/git"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/oci"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/git"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/oci"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/repository"
 	"go.opentelemetry.io/otel/trace"
 )
 

porch/repository/pkg/cache/cache_test.go → porch/pkg/cache/cache_test.go

@@ -21,8 +21,8 @@ import (
 
 	api "github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
 	"github.com/GoogleContainerTools/kpt/porch/api/porchconfig/v1alpha1"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/git"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/git"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/repository"
 	"github.com/google/go-cmp/cmp"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

porch/repository/pkg/cache/draft.go → porch/pkg/cache/draft.go

@@ -17,7 +17,7 @@ package cache
 import (
 	"context"
 
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/repository"
 )
 
 type cachedDraft struct {

porch/repository/pkg/cache/repository.go → porch/pkg/cache/repository.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/repository"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/mod/semver"

porch/apiserver/pkg/cmd/server/start.go → porch/pkg/cmd/server/start.go

@@ -28,7 +28,7 @@ import (
 	informers "github.com/GoogleContainerTools/kpt/porch/api/generated/informers/externalversions"
 	sampleopenapi "github.com/GoogleContainerTools/kpt/porch/api/generated/openapi"
 	porchv1alpha1 "github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
-	"github.com/GoogleContainerTools/kpt/porch/apiserver/pkg/apiserver"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/apiserver"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apiserver/pkg/admission"

porch/engine/pkg/engine/builtin.go → porch/pkg/engine/builtin.go

@@ -22,7 +22,7 @@ import (
 	"github.com/GoogleContainerTools/kpt/internal/fnruntime"
 	"github.com/GoogleContainerTools/kpt/pkg/fn"
 	api "github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/repository"
 	"sigs.k8s.io/kustomize/kyaml/fn/runtime/runtimeutil"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/yaml"

porch/engine/pkg/engine/builtinruntime.go → porch/pkg/engine/builtinruntime.go

@@ -24,7 +24,7 @@ import (
 	fnsdk "github.com/GoogleContainerTools/kpt-functions-sdk/go/fn"
 	v1 "github.com/GoogleContainerTools/kpt/pkg/api/kptfile/v1"
 	"github.com/GoogleContainerTools/kpt/pkg/fn"
-	"github.com/GoogleContainerTools/kpt/porch/engine/pkg/kpt"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/kpt"
 )
 
 var (

porch/engine/pkg/engine/clone.go → porch/pkg/engine/clone.go

@@ -25,9 +25,9 @@ import (
 	v1 "github.com/GoogleContainerTools/kpt/pkg/api/kptfile/v1"
 	api "github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
 	configapi "github.com/GoogleContainerTools/kpt/porch/api/porchconfig/v1alpha1"
-	"github.com/GoogleContainerTools/kpt/porch/engine/pkg/kpt"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/git"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/git"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/kpt"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/repository"
 	"go.opentelemetry.io/otel/trace"
 )
 

porch/engine/pkg/engine/clone_test.go → porch/pkg/engine/clone_test.go

@@ -29,8 +29,8 @@ import (
 	"time"
 
 	"github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/git"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/git"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/repository"
 	"github.com/go-git/go-billy/v5/memfs"
 	gogit "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"

porch/engine/pkg/engine/edit.go → porch/pkg/engine/edit.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 
 	api "github.com/GoogleContainerTools/kpt/porch/api/porch/v1alpha1"
-	"github.com/GoogleContainerTools/kpt/porch/engine/pkg/kpt"
-	"github.com/GoogleContainerTools/kpt/porch/repository/pkg/repository"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/kpt"
+	"github.com/GoogleContainerTools/kpt/porch/pkg/repository"
 	"go.opentelemetry.io/otel/trace"
 )