Merge remote-tracking branch 'upstream/main' into abusech-docs

Author: kcreddy

.buildkite/pipeline.backport.yml

@@ -31,10 +31,14 @@ steps:
  key: "BASE_COMMIT"
  required: true
  default: ""
- - text: "Enter package name"
+ - text: "Enter package name (as defined in manifest.yml)"
  key: "PACKAGE_NAME"
  required: true
  default: ""
+ - text: "Enter name of the folder for the package (in most cases coincides with PACKAGE_NAME)"
+ key: "PACKAGE_FOLDER_NAME"
+ required: true
+ default: ""
  - text: "Enter package version (examples: 1.5.7, 1.0.0-beta1)"
  key: "PACKAGE_VERSION"
  required: true

.buildkite/scripts/backport_branch.sh

@@ -16,11 +16,12 @@ trap cleanup_gh EXIT
 DRY_RUN="$(buildkite-agent meta-data get DRY_RUN --default ${DRY_RUN:-"true"})"
 BASE_COMMIT="$(buildkite-agent meta-data get BASE_COMMIT --default ${BASE_COMMIT:-""})"
 PACKAGE_NAME="$(buildkite-agent meta-data get PACKAGE_NAME --default ${PACKAGE_NAME:-""})"
+PACKAGE_FOLDER_NAME="$(buildkite-agent meta-data get PACKAGE_FOLDER_NAME --default ${PACKAGE_FOLDER_NAME:-""})"
 PACKAGE_VERSION="$(buildkite-agent meta-data get PACKAGE_VERSION --default ${PACKAGE_VERSION:-""})"
 REMOVE_OTHER_PACKAGES="$(buildkite-agent meta-data get REMOVE_OTHER_PACKAGES --default ${REMOVE_OTHER_PACKAGES:-"false"})"
 
-if [[ -z "$PACKAGE_NAME" ]] || [[ -z "$PACKAGE_VERSION" ]]; then
- buildkite-agent annotate "The variables **PACKAGE_NAME** or **PACKAGE_VERSION** aren't defined, please try again" --style "warning"
+if [[ -z "$PACKAGE_NAME" ]] || [[ -z "$PACKAGE_FOLDER_NAME" ]] || [[ -z "$PACKAGE_VERSION" ]]; then
+ buildkite-agent annotate "The variables **PACKAGE_NAME**, **PACKAGE_FOLDER_NAME** or **PACKAGE_VERSION** aren't defined, please try again" --style "warning"
  exit 1
 fi
 
@@ -29,6 +30,7 @@ PARAMETERS=(
  "**DRY_RUN**=$DRY_RUN"
  "**BASE_COMMIT**=$BASE_COMMIT"
  "**PACKAGE_NAME**=$PACKAGE_NAME"
+ "**PACKAGE_FOLDER_NAME**=$PACKAGE_FOLDER_NAME"
  "**PACKAGE_VERSION**=$PACKAGE_VERSION"
  "**REMOVE_OTHER_PACKAGES**=$REMOVE_OTHER_PACKAGES"
 )
@@ -98,7 +100,7 @@ removeOtherPackages() {
  local sourceFolder=$1
  local currentPackage=""
  for dir in "$sourceFolder"/*; do
- if [[ -d "$dir" ]] && [[ "$(basename "$dir")" != "$PACKAGE_NAME" ]]; then
+ if [[ -d "$dir" ]] && [[ "$(basename "$dir")" != "$PACKAGE_FOLDER_NAME" ]]; then
  echo "Removing directory: $dir"
  rm -rf "$dir"
 
@@ -174,6 +176,13 @@ updateBackportBranchContents() {
  git checkout "$SOURCE_BRANCH" -- ".go-version"
  git add .go-version
 
+ # Restore workflows from the main branch since modifying them requires extra permissions.
+ # > error: GH013: Repository rule violations found for ...
+ # > refusing to allow a GitHub App to create or update workflow `.github/workflows/bump-elastic-stack-version.yml` without `workflows` permission
+ echo "Copying .github/workflows from $SOURCE_BRANCH..."
+ git checkout "$SOURCE_BRANCH" -- ".github/workflows"
+ git add .github/workflows
+
  # Run go mod tidy to update just the dependencies related to magefile and dev scripts
  go mod tidy
 
@@ -205,7 +214,7 @@ updateBackportBranchContents() {
  if [ "$DRY_RUN" == "true" ];then
  echo "DRY_RUN mode, nothing will be pushed."
  # Show just the relevant files diff (go.mod, go.sum, .buildkite, dev, .go-version, .github/CODEOWNERS and package to be backported)
- git --no-pager diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME .buildkite/ dev/ go.sum go.mod .go-version .github/CODEOWNERS "packages/${PACKAGE_NAME}"
+ git --no-pager diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME .buildkite/ dev/ go.sum go.mod .go-version .github/CODEOWNERS "packages/${PACKAGE_FOLDER_NAME}"
  else
  echo "Pushing..."
  git push origin $BACKPORT_BRANCH_NAME
@@ -245,15 +254,15 @@ if branchExist "$BACKPORT_BRANCH_NAME"; then
 fi
 
 # backport branch does not exist, running checks and create branch
-version="$(git show "${BASE_COMMIT}":"packages/${PACKAGE_NAME}/manifest.yml" | yq -r .version)"
+version="$(git show "${BASE_COMMIT}":"packages/${PACKAGE_FOLDER_NAME}/manifest.yml" | yq -r .version)"
 echo "Check if version from ${BASE_COMMIT} (${version}) matches with version from input step ${PACKAGE_VERSION}"
 if [[ "${version}" != "${PACKAGE_VERSION}" ]]; then
- buildkite-agent annotate "Unexpected version found in packages/${PACKAGE_NAME}/manifest.yml" --style "error"
+ buildkite-agent annotate "Unexpected version found in packages/${PACKAGE_FOLDER_NAME}/manifest.yml" --style "error"
  exit 1
 fi
 
 echo "Check that this changeset is the one creating the version $PACKAGE_NAME"
-if ! git show -p ${BASE_COMMIT} packages/${PACKAGE_NAME}/manifest.yml | grep -E "^\+version: \"{0,1}${PACKAGE_VERSION}" ; then
+if ! git show -p ${BASE_COMMIT} packages/${PACKAGE_FOLDER_NAME}/manifest.yml | grep -E "^\+version: \"{0,1}${PACKAGE_VERSION}" ; then
  buildkite-agent annotate "This changeset does not creates the version ${PACKAGE_VERSION}" --style "error"
  exit 1
 fi