Merge remote-tracking branch 'origin/master' into BNP_update_suexec

Author: bnpfeife

.circleci/config.yml

@@ -1,11 +1,38 @@
+---
 version: 2.1
 
+master_filter: &master_filter
+  filters:
+    tags:
+      ignore: /.*/
+    branches:
+      only:
+        - master
+
+ubuntu_machine: &ubuntu_machine
+  machine:
+    image: ubuntu-2004:202111-02
+    docker_layer_caching: true
+
 workflows:
   version: 2
   ci:
     jobs:
       - build
-      - test-influxdb
+      - test-influxdb:
+          matrix:
+            parameters:
+              version: ["2.0", "2.1", "2.2", "2.3"]
+      - publish_docker_images:
+          <<: *master_filter
+      - test-influxdb-binaries:
+          matrix:
+            parameters:
+              product:
+                - "influxdb/1.9/data"
+                - "influxdb/1.9/meta"
+                - "influxdb/1.10/data"
+                - "influxdb/1.10/meta"
 
 jobs:
   build:
@@ -17,11 +44,58 @@ jobs:
       - run: bash circle-test.sh
 
   test-influxdb:
-    machine: true
+    <<: *ubuntu_machine
+    parameters:
+      version:
+        type: string
+        enum: ["2.0", "2.1", "2.2", "2.3"]
     steps:
       - checkout
-      - run: sudo apt-get update && sudo apt-get install -y jq
-      - run: bash influxdb/test/test-2x-e2e.sh
+      - run: |
+          sudo apt-get update &&
+          sudo apt-get install -y jq
+      - run: bash influxdb/test/test-2x-e2e.sh << parameters.version >>
       - store_artifacts:
           path: influxdb/test/logs
           destination: container-logs
+
+  publish_docker_images:
+    docker:
+      - image: 'cimg/python:3.6'
+    steps:
+      - checkout
+      - run:
+          name: Install Prerequisite Packages
+          command: |
+            sudo bash -s \<<EOF
+              #!/bin/bash
+              set -o errexit  \
+                  -o nounset  \
+                  -o pipefail
+
+              export DEBIAN_FRONTEND=noninteractive
+              apt-get update
+              apt-get install --yes git
+            EOF
+
+            python3 -m pip install -r \
+              .circleci/scripts/update_manifest_file/requirements.txt
+      - run:
+          name: Get Enterprise Information
+          command: |
+            python3 .circleci/scripts/get_enterprise_info
+      - run:
+          name: Do Enterprise Release
+          command: |
+            .circleci/scripts/do-enterprise-release
+
+  test-influxdb-binaries:
+    <<: *ubuntu_machine
+    parameters:
+      product:
+        type: string
+    steps:
+      - checkout
+      - run:
+          name: Validate Docker Image Binaries
+          command: influxdb/test/test-binaries << parameters.product >>

.circleci/scripts/create-draft-pr

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -o errexit  \
+    -o nounset  \
+    -o pipefail
+
+# ${1} -> ENDPOINT
+# ${2} -> HEAD
+# ${3} -> TITLE
+
+read -d '' -r DATA <<EOF || true
+{
+  "title": "${3}",
+  "head":  "${2}",
+  "base":  "master",
+  "draft": true
+}
+EOF
+
+curl                                                 \
+  -X POST                                            \
+  -H "Accept: application/vnd.github.v3+json"        \
+  -H "Authorization: Bearer ${GITHUB_MACHINE_TOKEN}" \
+  "${1}" -d "${DATA}"
+

.circleci/scripts/do-enterprise-release

@@ -0,0 +1,40 @@
+#!/bin/bash
+set -o errexit  \
+    -o nounset  \
+    -o pipefail
+
+if [[ ${PRODUCT:-} != 'influxdb' ]] || \
+  [[ ${VERSION_MAJOR:-} != '1' ]] || \
+  [[ ${VERSION_MINOR:-} != '9' ]]
+then
+  printf 'Release is not Enterprise skipping...\n'; exit 0
+fi
+
+git clone [email protected]:/docker-library/official-images
+
+python3 .circleci/scripts/update_manifest_file official-images/library/influxdb
+
+pushd official-images
+
+  # CircleCI preloads the ssh-agent with the secret key required to clone
+  # the repository. Unfortunately, this secret key does not have the
+  # required permissions to `push`. This flushes the ssh-agent of
+  # keys so that the `${SSH_MACHINE_SECKEY}` is always used.
+  ssh-add -D && base64 -d <<<"${SSH_MACHINE_SECKEY}" | ssh-add -
+
+  git config user.name  "${GITHUB_MACHINE_NAME}"
+  git config user.email "${GITHUB_MACHINE_EMAIL}"
+
+  # We always branch from 'origin/master' to use the most up-to-date
+  # source and avoid merge conflicts.
+  git checkout -b "CI_release_${VERSION}" "origin/master"
+
+  git add . && git commit -m "feat: release Enterprise ${VERSION}"
+
+  # If this workflow is executed multiple times, it's possible that a branch
+  # named `CI_release_${VERSION}` already exists. If this is the
+  # case, we overwrite it with our commits.
+  git remote add influxdata [email protected]:/influxdata/official-images
+  git push -f --set-upstream influxdata "CI_release_${VERSION}"
+
+popd

.circleci/scripts/get_enterprise_info/__main__.py

@@ -0,0 +1,125 @@
+#!/usr/bin/python3
+from typing import Dict
+from typing import Generator
+from typing import Optional
+import os
+import re
+import subprocess
+import enum
+
+
+def getenv(variable: str) -> str:
+    """
+    Retrieves `variable` from the environment.
+    """
+    # `os.getenv` returns `Dict[str]` which is incompatible with functions
+    # that require `str` parameters. If `os.getenv` returns a value, it is
+    # unwrapped and returned to the caller.
+    value = os.getenv(variable)
+    if value is not None:
+        return value
+
+    raise RuntimeError('Missing environment variable "{}".'.format(variable))
+
+
+class GitDiff(enum.Enum):
+    # fmt: off
+    ADDED   = "\+"
+    REMOVED = "\-"
+    # fmt: on
+
+    def __str__(self):
+        return str(self.value)
+
+
+def parse_env_line(line: str, diff: GitDiff) -> Optional[Dict[str, str]]:
+    """
+    Matches version line in dockerfile.
+    """
+    # fmt: off
+    matches = re.match(
+      r"^" + str(diff)             +  # changed?
+      r"ENV\s+INFLUXDB_VERSION\s+" +  # prelude
+       r"((\d+)"                   +  # major         cg: 2
+       r"(?:\.(\d+))?"             +  # minor?        cg: 3
+       r"(?:\.(\d+))?"             +  # patch?        cg: 4
+       r"(?:\-?(rc\d+))?)"         +  # rc?           cg: 5
+      r"-c"                        +  # interlude
+      r"(\d+)"                     +  # repeat major  cg: 6
+      r"(?:\.(\d+))?"              +  # repeat minor? cg: 7
+      r"(?:\.(\d+))?"              +  # repeat patch? cg: 8
+      r"(?:\-?(rc\d+))?",             # repeat rc?    cg: 9
+      line)
+
+    if matches is not None:
+        # I tried using capture-group back-references within the regular
+        # expression. However, it couldn't handle optional capture-
+        # groups. So, instead, we check for equality here.
+        if (matches.group(2) == matches.group(6) and
+            matches.group(3) == matches.group(7) and
+            matches.group(4) == matches.group(8) and
+            matches.group(5) == matches.group(9)):
+            return {
+                "VERSION":       matches.group(1),
+                "VERSION_MAJOR": matches.group(2),
+                "VERSION_MINOR": matches.group(3) if matches.group(3) else "",
+                "VERSION_PATCH": matches.group(4) if matches.group(4) else "",
+                "VERSION_RC":    matches.group(5) if matches.group(5) else "",
+            }
+    return None
+    # fmt: on
+
+
+def parse_version() -> Optional[str]:
+    """
+    Parse version from "ENV" line in git.
+    """
+    # Retrieve all lines that have changed since the commit between
+    # HEAD~1 and HEAD. This is more robust than just parsing the
+    # current Dockerfile as it ensures that `INFLUXDB_VERSION`
+    # actually changed.
+    # fmt: off
+    process = subprocess.run(
+        ["git", "diff", "--unified=0", "HEAD~1..HEAD", "influxdb" ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
+    # fmt: on
+
+    version_prev = None
+    version_curr = None
+    for line in process.stdout.decode("utf-8").split("\n"):
+        line = line.rstrip(" \t")
+        prev = parse_env_line(line, GitDiff.REMOVED)
+        curr = parse_env_line(line, GitDiff.ADDED)
+
+        if prev is not None:
+            version_prev = prev
+        if curr is not None:
+            version_curr = curr
+
+        # fmt: off
+        if (version_prev is not None and
+            version_curr is not None):
+            # if the versions differ, then this must be a release
+            if version_prev["VERSION"] != version_curr["VERSION"]:
+                return version_curr
+        # fmt: on
+
+        # If the `INFLUXDB_VERSION` line has changed but the version has
+        # not changed, reset so the next encounter of `version_prev`
+        # does not cause this to return the incorrect `version_curr`.
+        if version_curr != None:
+            version_prev = None
+            version_curr = None
+
+    # no version change in dockerfile
+    return None
+
+
+version = parse_version()
+if version is not None:
+    with open(getenv("BASH_ENV"), "a") as stream:
+        stream.write("export PRODUCT=influxdb\n")
+        for key, value in version.items():
+            stream.write("export {}={}\n".format(key, value))