From bb7a7e28187ba6c7e68237d84c0e939e1e755aa2 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Fri, 5 Jan 2024 22:58:42 +0100 Subject: [PATCH 1/3] fix(hack/prepare.sh): don't change a URL comment in the Makefile A previous sed command breaks a URL that is in a comment in the Makefile. This commit reverts that change Signed-off-by: Theo Chatzimichos --- hack/prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/prepare.sh b/hack/prepare.sh index c7a649b..6922354 100755 --- a/hack/prepare.sh +++ b/hack/prepare.sh @@ -23,7 +23,7 @@ git grep -l "ujconfig\.WithRootGroup(\"${PROVIDER_NAME_LOWER}.upbound\.io\")" -- # We need to be careful while replacing "template" keyword in go.mod as it could tamper # some imported packages under require section. sed -i.bak "s|upbound/upjet-provider-template|${ORGANIZATION_NAME}/provider-${PROVIDER_NAME_LOWER}|g" go.mod -sed -i.bak "s|PROJECT_REPO ?= github.com/upbound/|PROJECT_REPO ?= github.com/${ORGANIZATION_NAME}/|g" Makefile +sed -i.bak -e "s|PROJECT_REPO ?= github.com/upbound/|PROJECT_REPO ?= github.com/${ORGANIZATION_NAME}/|g" -e "s|\(blob/main/internal/\)${PROVIDER_NAME_LOWER}s|\1templates|g" Makefile sed -i.bak "s/\[YEAR\]/$(date +%Y)/g" LICENSE # Clean up the .bak files created by sed From 761ec6d34981eb7a722c2eb9bafedddbd9040b1f Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Sat, 6 Jan 2024 09:55:43 +0100 Subject: [PATCH 2/3] fix(Makefile): correct the URL in a comment Signed-off-by: Theo Chatzimichos --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a9c9cdd..9fdfde0 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,7 @@ CROSSPLANE_NAMESPACE = upbound-system # This target requires the following environment variables to be set: # - UPTEST_EXAMPLE_LIST, a comma-separated list of examples to test # To ensure the proper functioning of the end-to-end test resource pre-deletion hook, it is crucial to arrange your resources appropriately. -# You can check the basic implementation here: https://github.com/upbound/uptest/blob/main/internal/templates/01-delete.yaml.tmpl. +# You can check the basic implementation here: https://github.com/upbound/uptest/blob/main/internal/templates/03-delete.yaml.tmpl. # - UPTEST_CLOUD_CREDENTIALS (optional), multiple sets of AWS IAM User credentials specified as key=value pairs. # The support keys are currently `DEFAULT` and `PEER`. So, an example for the value of this env. variable is: # DEFAULT='[default] From c94e3b0f397aa0a7a012ad8c90b03c29501e66c7 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Thu, 4 Apr 2024 13:06:23 +0300 Subject: [PATCH 3/3] fix(Makefile): fix again the previous URL, the repo changed org Signed-off-by: Theo Chatzimichos --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9fdfde0..b7e03cc 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,7 @@ CROSSPLANE_NAMESPACE = upbound-system # This target requires the following environment variables to be set: # - UPTEST_EXAMPLE_LIST, a comma-separated list of examples to test # To ensure the proper functioning of the end-to-end test resource pre-deletion hook, it is crucial to arrange your resources appropriately. -# You can check the basic implementation here: https://github.com/upbound/uptest/blob/main/internal/templates/03-delete.yaml.tmpl. +# You can check the basic implementation here: https://github.com/crossplane/uptest/blob/main/internal/templates/03-delete.yaml.tmpl. # - UPTEST_CLOUD_CREDENTIALS (optional), multiple sets of AWS IAM User credentials specified as key=value pairs. # The support keys are currently `DEFAULT` and `PEER`. So, an example for the value of this env. variable is: # DEFAULT='[default]