Merge pull request #500 from aryan9600/internal-controllers

move `controllers` to `internal/controllers`
fluxcd · Mar 27, 2023 · 946bb84 · 946bb84
2 parents 7889652 + c62e9f2
commit 946bb84
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@ notes
 
 # Thes are downloaded in the Makefile
 cache/*
-controllers/testdata/crds/*
+internal/controllers/testdata/crds/*
 
 # Binaries for programs and plugins
 *.exe
@@ -31,3 +31,6 @@ testbin
 
 # Exclude all build related files
 build/
+
+# CRDs for fuzzing tests.
+internal/controllers/testdata/crd
diff --git a/Dockerfile b/Dockerfile
@@ -40,7 +40,6 @@ RUN go mod download
 
 # Copy source code
 COPY main.go main.go
-COPY controllers/ controllers/
 COPY pkg/ pkg/
 COPY internal/ internal/
 

diff --git a/Makefile b/Makefile
@@ -69,7 +69,7 @@ ifeq ($(shell uname -s),Darwin)
 ENVTEST_ARCH=amd64
 endif
 
-TEST_CRDS := controllers/testdata/crds
+TEST_CRDS := internal/controllers/testdata/crds
 
 # Log level for `make run`
 LOG_LEVEL ?= info

diff --git a/controllers/controllers_fuzzer_test.go → ...al/controllers/controllers_fuzzer_test.go b/controllers/controllers_fuzzer_test.go → ...al/controllers/controllers_fuzzer_test.go
diff --git a/...llers/imageupdateautomation_controller.go → ...llers/imageupdateautomation_controller.go b/...llers/imageupdateautomation_controller.go → ...llers/imageupdateautomation_controller.go
diff --git a/.../imageupdateautomation_controller_test.go → .../imageupdateautomation_controller_test.go b/.../imageupdateautomation_controller_test.go → .../imageupdateautomation_controller_test.go
diff --git a/controllers/suite_test.go → internal/controllers/suite_test.go b/controllers/suite_test.go → internal/controllers/suite_test.go
@@ -67,7 +67,7 @@ func TestMain(m *testing.M) {
 
 func runTestsWithFeatures(m *testing.M, feats map[string]bool) int {
 	testEnv = testenv.New(testenv.WithCRDPath(
-		filepath.Join("..", "config", "crd", "bases"),
+		filepath.Join("..", "..", "config", "crd", "bases"),
 		filepath.Join("testdata", "crds"),
 	))
 

diff --git a/...s/testdata/appconfig-expected/deploy.yaml → ...s/testdata/appconfig-expected/deploy.yaml b/...s/testdata/appconfig-expected/deploy.yaml → ...s/testdata/appconfig-expected/deploy.yaml
diff --git a/.../testdata/appconfig-expected2/deploy.yaml → .../testdata/appconfig-expected2/deploy.yaml b/.../testdata/appconfig-expected2/deploy.yaml → .../testdata/appconfig-expected2/deploy.yaml
diff --git a/...ta/appconfig-setters-expected/deploy.yaml → ...ta/appconfig-setters-expected/deploy.yaml b/...ta/appconfig-setters-expected/deploy.yaml → ...ta/appconfig-setters-expected/deploy.yaml
diff --git a/controllers/testdata/appconfig/deploy.yaml → ...ontrollers/testdata/appconfig/deploy.yaml b/controllers/testdata/appconfig/deploy.yaml → ...ontrollers/testdata/appconfig/deploy.yaml
diff --git a/controllers/testdata/brokenlink/bar.yaml → .../controllers/testdata/brokenlink/bar.yaml b/controllers/testdata/brokenlink/bar.yaml → .../controllers/testdata/brokenlink/bar.yaml
diff --git a/...ollers/testdata/pathconfig/no/deploy.yaml → ...ollers/testdata/pathconfig/no/deploy.yaml b/...ollers/testdata/pathconfig/no/deploy.yaml → ...ollers/testdata/pathconfig/no/deploy.yaml
diff --git a/...llers/testdata/pathconfig/yes/deploy.yaml → ...llers/testdata/pathconfig/yes/deploy.yaml b/...llers/testdata/pathconfig/yes/deploy.yaml → ...llers/testdata/pathconfig/yes/deploy.yaml
diff --git a/controllers/update_test.go → internal/controllers/update_test.go b/controllers/update_test.go → internal/controllers/update_test.go
diff --git a/main.go b/main.go
@@ -46,7 +46,7 @@ import (
 	"github.com/fluxcd/pkg/git"
 
 	// +kubebuilder:scaffold:imports
-	"github.com/fluxcd/image-automation-controller/controllers"
+	"github.com/fluxcd/image-automation-controller/internal/controllers"
 )
 
 const (

diff --git a/tests/fuzz/oss_fuzz_prebuild.sh b/tests/fuzz/oss_fuzz_prebuild.sh
@@ -21,8 +21,8 @@ set -euxo pipefail
 
 # Some tests requires embedded resources. Embedding does not allow
 # for traversing into ascending dirs, therefore we copy those contents here:
-mkdir -p controllers/testdata/crd
-cp config/crd/bases/*.yaml controllers/testdata/crd
+mkdir -p internal/controllers/testdata/crd
+cp config/crd/bases/*.yaml internal/controllers/testdata/crd
 
 # Version of the source-controller from which to get the GitRepository CRD.
 # Pulls source-controller/api's version set in go.mod.
@@ -32,10 +32,10 @@ SOURCE_VER=$(go list -m github.com/fluxcd/source-controller/api | awk '{print $2
 # Pulls image-reflector-controller/api's version set in go.mod.
 REFLECTOR_VER=$(go list -m github.com/fluxcd/image-reflector-controller/api | awk '{print $2}')
 
-if [ -d "../../controllers/testdata/crds" ]; then
-    cp ../../controllers/testdata/crds/*.yaml testdata/crds
+if [ -d "../../internal/controllers/testdata/crds" ]; then
+    cp ../../internal/controllers/testdata/crds/*.yaml testdata/crds
 else
     # Fetch the CRDs if not present since we need them when running fuzz tests on CI.
-    curl -s --fail https://raw.githubusercontent.com/fluxcd/source-controller/${SOURCE_VER}/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml -o controllers/testdata/crd/gitrepositories.yaml
-    curl -s --fail https://raw.githubusercontent.com/fluxcd/image-reflector-controller/${REFLECTOR_VER}/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml -o controllers/testdata/crd/imagepolicies.yaml
+    curl -s --fail https://raw.githubusercontent.com/fluxcd/source-controller/${SOURCE_VER}/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml -o internal/controllers/testdata/crd/gitrepositories.yaml
+    curl -s --fail https://raw.githubusercontent.com/fluxcd/image-reflector-controller/${REFLECTOR_VER}/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml -o internal/controllers/testdata/crd/imagepolicies.yaml
 fi