Merge branch 'main' into partition

.github/workflows/uptest-trigger.yaml

@@ -9,7 +9,6 @@ on:
     types: [created]
 
 env:
-  TRIGGER_KEYWORD: "/test-examples"
   GO_VERSION: "1.22"
 
 jobs:
@@ -18,14 +17,14 @@ jobs:
     steps:
       - name: Debug
         run: |
-          echo "Trigger keyword: ${{ env.TRIGGER_KEYWORD }}"
+          echo "Trigger keyword: '/test-examples'"
           echo "Go version: ${{ env.GO_VERSION }}"
           echo "github.event.comment.author_association: ${{ github.event.comment.author_association }}"
 
   get-example-list:
     if: ${{ (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'COLLABORATOR' || github.event.comment.author_association == 'CONTRIBUTOR' ) &&
       github.event.issue.pull_request &&
-      contains(github.event.comment.body, env.TRIGGER_KEYWORD ) }}
+      contains(github.event.comment.body, '/test-examples' ) }}
     runs-on: ubuntu-latest
     outputs:
       example_list: ${{ steps.get-example-list-name.outputs.example-list }}
@@ -82,7 +81,7 @@ jobs:
   uptest:
     if: ${{ (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'COLLABORATOR' || github.event.comment.author_association == 'CONTRIBUTOR' ) &&
       github.event.issue.pull_request &&
-      contains(github.event.comment.body, env.TRIGGER_KEYWORD ) }}
+      contains(github.event.comment.body, '/test-examples' ) }}
     runs-on: ubuntu-latest
     needs: get-example-list
 

.gitignore

@@ -10,6 +10,9 @@ cover.out
 /.vendor-new
 .DS_Store
 kubeconfig
+e2e/*/.cache
+e2e/*/.work
+e2e/*/_output
 
 # ignore IDE folders
 .vscode/

Makefile

@@ -11,8 +11,8 @@ PROJECT_NAME := provider-$(PROVIDER_NAME)
 PROJECT_REPO := github.com/upbound/$(PROJECT_NAME)
 
 export TERRAFORM_VERSION := 1.5.5
-export TERRAFORM_PROVIDER_VERSION := 5.68.0
-export TERRAFORM_PROVIDER_RELEASE := v$(TERRAFORM_PROVIDER_VERSION)-upjet.2
+export TERRAFORM_PROVIDER_VERSION := 5.73.0
+export TERRAFORM_PROVIDER_RELEASE := v$(TERRAFORM_PROVIDER_VERSION)-upjet.1
 export TERRAFORM_PROVIDER_SOURCE := hashicorp/aws
 export TERRAFORM_PROVIDER_REPO ?= https://github.com/hashicorp/terraform-provider-aws
 export TERRAFORM_DOCS_PATH ?= website/docs/r
@@ -86,6 +86,7 @@ UPTEST_LOCAL_CHANNEL = stable
 KUSTOMIZE_VERSION = v5.3.0
 YQ_VERSION = v4.40.5
 CROSSPLANE_VERSION = 1.14.6
+CRDDIFF_VERSION = v0.12.1
 
 export UP_VERSION := $(UP_VERSION)
 export UP_CHANNEL := $(UP_CHANNEL)
@@ -241,6 +242,40 @@ uptest: $(UPTEST_LOCAL) $(KUBECTL) $(KUTTL)
 	@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) CROSSPLANE_NAMESPACE=$(CROSSPLANE_NAMESPACE) $(UPTEST_LOCAL) e2e "${UPTEST_EXAMPLE_LIST}" --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=cluster/test/setup.sh --default-conditions="Test" || $(FAIL)
 	@$(OK) running automated tests
 
+# This target triggers an e2e test for testing provider configs.
+# It first builds and publishes the
+# provider-family-aws, provider-aws-ec2 and provider-aws-rds.
+# Then triggers the e2e provider config tests via `make`,
+# which resides in the `e2e/providerconfig-aws-e2e-test` directory
+#
+# For the e2e test, an EKS cluster is created and some demo resources are
+# created with different provider configs. The demo resources are from
+# AWS EC2 and RDS providers.
+# Therefore, the provider packages needs to be published to a registry
+# that the EKS cluster has access to. This defaults to "xpkg.upbound.io"
+# If another registry needs to be used, `XPKG_REG_ORGS` needs to be overridden
+# with a registry that the EKS cluster has access, while invoking this make target.
+#
+# This target also requires the `UPTEST_CLOUD_CREDENTIALS` environment variable
+# to be set. This is used for provisioning the target E2E test environment,
+# including the EKS cluster and necessary environments.
+providerconfig-e2e:
+	$(MAKE) SUBPACKAGES="ec2 rds kafka config" build.all publish
+	AWS_FAMILY_PACKAGE_IMAGE="$(XPKG_REG_ORGS)/provider-family-aws:$(VERSION)" \
+	AWS_EC2_PACKAGE_IMAGE="$(XPKG_REG_ORGS)/provider-aws-ec2:$(VERSION)" \
+	AWS_RDS_PACKAGE_IMAGE="$(XPKG_REG_ORGS)/provider-aws-rds:$(VERSION)" \
+	AWS_KAFKA_PACKAGE_IMAGE="$(XPKG_REG_ORGS)/provider-aws-kafka:$(VERSION)" \
+	TARGET_CROSSPLANE_VERSION="1.17.2" \
+		$(MAKE) -C e2e/providerconfig-aws-e2e-test e2e
+
+providerconfig-e2e-nopublish:
+	AWS_FAMILY_PACKAGE_IMAGE="$(XPKG_REG_ORGS)/provider-family-aws:$(VERSION)" \
+	AWS_EC2_PACKAGE_IMAGE="$(XPKG_REG_ORGS)/provider-aws-ec2:$(VERSION)" \
+	AWS_RDS_PACKAGE_IMAGE="$(XPKG_REG_ORGS)/provider-aws-rds:$(VERSION)" \
+	AWS_KAFKA_PACKAGE_IMAGE="$(XPKG_REG_ORGS)/provider-aws-kafka:$(VERSION)" \
+	TARGET_CROSSPLANE_VERSION="1.17.2" \
+		$(MAKE) -C e2e/providerconfig-aws-e2e-test e2e
+
 uptest-local:
 	@$(WARN) "this target is deprecated, please use 'make uptest' instead"
 
@@ -297,15 +332,15 @@ e2e: family-e2e
 
 # TODO: please move this to the common build submodule
 # once the use cases mature
-crddiff: $(UPTEST)
+crddiff:
 	@$(INFO) Checking breaking CRD schema changes
 	@for crd in $${MODIFIED_CRD_LIST}; do \
 		if ! git cat-file -e "$${GITHUB_BASE_REF}:$${crd}" 2>/dev/null; then \
 			echo "CRD $${crd} does not exist in the $${GITHUB_BASE_REF} branch. Skipping..." ; \
 			continue ; \
 		fi ; \
 		echo "Checking $${crd} for breaking API changes..." ; \
-		changes_detected=$$($(UPTEST) crddiff revision --enable-upjet-extensions <(git cat-file -p "$${GITHUB_BASE_REF}:$${crd}") "$${crd}" 2>&1) ; \
+		changes_detected=$$(go run github.com/upbound/uptest/cmd/crddiff@$(CRDDIFF_VERSION) revision --enable-upjet-extensions <(git cat-file -p "$${GITHUB_BASE_REF}:$${crd}") "$${crd}" 2>&1) ; \
 		if [[ $$? != 0 ]] ; then \
 			printf "\033[31m"; echo "Breaking change detected!"; printf "\033[0m" ; \
 			echo "$${changes_detected}" ; \