Merge branch 'main' into feat/aoss-collection-group

Author: msessa

.github/workflows/ci.yml

@@ -183,7 +183,9 @@ jobs:
         run: make vendor vendor.check
 
       - name: Run Unit Tests
-        run: make -j2 test
+        # API conversion roundtrip tests might exceed
+        # the default 10m timeout
+        run: make -j2 GO_TEST_FLAGS="-timeout 15m" test
 
   local-deploy:
     runs-on: ubuntu-latest

Makefile

@@ -435,6 +435,18 @@ delete-build-tags:
 	@$(OK) Untagging source files.
 endif
 
+# TODO: Temporary workaround for https://github.com/crossplane/build/issues/61
+# Remove when issue is addressed.
+# `go.test.unit` does not propagate GO_TEST_FLAGS for the first `go test`
+# invocation at https://github.com/crossplane/build/blob/38cdd2d9558259446cdf476a769e4c462fbc308f/makelib/golang.mk#L115.
+# Duplicate and override `go.test.unit` here
+go.test.unit:
+	@$(INFO) go test unit-tests
+	@mkdir -p $(GO_TEST_OUTPUT)
+	@CGO_ENABLED=$(GO_CGO_ENABLED) $(GOHOST) test -cover $(GO_TEST_FLAGS) $(GO_STATIC_FLAGS) $(GO_PACKAGES) || $(FAIL)
+	@CGO_ENABLED=$(GO_CGO_ENABLED) $(GOHOST) test -v -covermode=$(GO_COVER_MODE) -coverprofile=$(GO_TEST_OUTPUT)/coverage.txt $(GO_TEST_FLAGS) $(GO_STATIC_FLAGS) $(GO_PACKAGES) 2>&1 | tee $(GO_TEST_OUTPUT)/unit-tests.log || $(FAIL)
+	@$(OK) go test unit-tests
+
 # TODO(negz): Update CI to use these targets.
 vendor: modules.download
 vendor.check: modules.check

config/test/roundtrip/custom_fillers_test.go

@@ -2,8 +2,6 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-//nolint:typecheck // due to buildtagger constraints
-
 package roundtrip
 
 import (

scripts/tag.sh

@@ -31,17 +31,16 @@ fi
 "${TAGGER}" --parent-dir "${REPO_ROOT}"/config/cluster --regex "(.+)/config\.go" --tag-format "(%s || all) && !ignore_autogenerated" --mode dir ${EXTRA_BUILDTAGGER_ARGS}
 "${TAGGER}" --parent-dir "${REPO_ROOT}"/config/namespaced --regex "(.+)/config\.go" --tag-format "(%s || all) && !ignore_autogenerated" --mode dir ${EXTRA_BUILDTAGGER_ARGS}
 
+"${TAGGER}" --parent-dir "${REPO_ROOT}"/config/cluster --regex "(.+)/config_test\.go" --tag-format "(%s || all) && !ignore_autogenerated" --mode dir ${EXTRA_BUILDTAGGER_ARGS}
+"${TAGGER}" --parent-dir "${REPO_ROOT}"/config/namespaced --regex "(.+)/config_test\.go" --tag-format "(%s || all) && !ignore_autogenerated" --mode dir ${EXTRA_BUILDTAGGER_ARGS}
+
 # constant tags
 # apis/zz_register.go -> (apiregister || register || all) && !ignore_autogenerated
 "${TAGGER}" --parent-dir "${REPO_ROOT}"/apis/cluster/zz_register.go --tag-format "all && !ignore_autogenerated" --mode file ${EXTRA_BUILDTAGGER_ARGS}
 "${TAGGER}" --parent-dir "${REPO_ROOT}"/apis/namespaced/zz_register.go --tag-format "all && !ignore_autogenerated" --mode file ${EXTRA_BUILDTAGGER_ARGS}
 
 # cmd/generator/main.go -> config || generate || all
 "${TAGGER}" --parent-dir "${REPO_ROOT}"/cmd/generator/main.go --tag-format "all" --mode file ${EXTRA_BUILDTAGGER_ARGS}
-# config/autoscaling/config_test.go -> (autoscaling || config || all) && !ignore_autogenerated
-"${TAGGER}" --parent-dir "${REPO_ROOT}"/config/cluster/autoscaling/config_test.go --tag-format "(autoscaling || all) && !ignore_autogenerated" --mode file ${EXTRA_BUILDTAGGER_ARGS}
-# config/elasticache/config_test.go -> (autoscaling || config || all) && !ignore_autogenerated
-"${TAGGER}" --parent-dir "${REPO_ROOT}"/config/cluster/elasticache/config_test.go --tag-format "(elasticache || all) && !ignore_autogenerated" --mode file ${EXTRA_BUILDTAGGER_ARGS}
 # config/common/apis/lambda/extractor.go -> config || lambda || all
 "${TAGGER}" --parent-dir "${REPO_ROOT}"/config/cluster/common/apis/lambda/extractor.go --tag-format "lambda || all" --mode file ${EXTRA_BUILDTAGGER_ARGS}
 "${TAGGER}" --parent-dir "${REPO_ROOT}"/config/namespaced/common/apis/lambda/extractor.go --tag-format "lambda || all" --mode file ${EXTRA_BUILDTAGGER_ARGS}
@@ -68,6 +67,9 @@ fi
 "${TAGGER}" --parent-dir "${REPO_ROOT}"/internal/controller/cluster/eks/clusterauth/eks.go --tag-format "eks || all" --mode file ${EXTRA_BUILDTAGGER_ARGS}
 "${TAGGER}" --parent-dir "${REPO_ROOT}"/internal/controller/namespaced/eks/clusterauth/eks.go --tag-format "eks || all" --mode file ${EXTRA_BUILDTAGGER_ARGS}
 
+# config/test/roundtrip -> all
+"${TAGGER}" --parent-dir "${REPO_ROOT}"/config/test/roundtrip --regex ".+_test\.go" --tag-format "all && !ignore_autogenerated && !linter_run" --mode dir ${EXTRA_BUILDTAGGER_ARGS}
+
 if [[ "${RESTORE_DEEPCOPY_TAGS}" == "true" ]]; then
   "${TAGGER}" --parent-dir "${REPO_ROOT}"/apis --regex "zz_generated.deepcopy.go" --tag-format "!ignore_autogenerated" --mode file
 fi