Inline Docker commands (#30)

.github/actions/install-dependencies/action.sh

@@ -5,7 +5,7 @@ python -m pip install --upgrade pip
 
 if [[ "${INSTALL_REQUIREMENTS}" == "true"  ]]; then
   echo "Installing code requirements"
-  pip install -r requirements.lock
+  pip install -r requirements.txt
 fi
 
 if [[ "${INSTALL_TEST_REQUIREMENTS}" == "true"  ]]; then

.github/pull_request_template.md

@@ -13,8 +13,4 @@ Please run through before submitting for final review:
 - [ ] The PR title is descriptive of what changed.
 - [ ] The description sections above are filled out.
 - [ ] The CI pipeline is passing
-- [ ] The plugin version has been bumped (using [SemVer](https://semver.org/spec/v2.0.0.html))
-
-    The plugin version should be bumped both in `.env` and in the README. **The plugin version is listed multiple times in the readme. Be sure to do a find/replace to ensure you haven't missed any!**
-
 - [ ] Added the `ready-for-review` label to the PR.

.github/workflows/lint.yml

@@ -37,7 +37,7 @@ jobs:
           test-requirements: "true"
 
       - name: Run bandit
-        run: bandit --ini .bandit -r deploy.py
+        run: bandit --ini .bandit -r plugin_scripts/deploy.py
 
   black:
     runs-on: ubuntu-latest
@@ -55,7 +55,7 @@ jobs:
           test-requirements: "true"
 
       - name: Run black
-        run: black --check deploy.py tests/test_deploy.py
+        run: black --check plugin_scripts/deploy.py tests/test_deploy.py
 
   flake8:
     runs-on: ubuntu-latest
@@ -72,7 +72,7 @@ jobs:
           test-requirements: "true"
 
       - name: Run flake8
-        run: flake8 deploy.py tests/test_deploy.py
+        run: flake8 plugin_scripts/deploy.py tests/test_deploy.py
 
   isort:
     runs-on: ubuntu-latest
@@ -89,7 +89,7 @@ jobs:
           test-requirements: "true"
 
       - name: Run isort
-        run: isort --recursive --check-only deploy.py tests/test_deploy.py
+        run: isort --recursive --check-only plugin_scripts/deploy.py tests/test_deploy.py
 
   mypy:
     runs-on: ubuntu-latest
@@ -106,4 +106,4 @@ jobs:
           test-requirements: "true"
 
       - name: Run mypy
-        run: mypy deploy.py tests/test_deploy.py
+        run: mypy plugin_scripts/deploy.py tests/test_deploy.py

.github/workflows/test.yml

@@ -4,16 +4,12 @@ on:
   push:
       branches: ["main"]
 
+env:
+  PYTHON_VERSION: "3.9.1"
+
 jobs:
   test:
-    name: Buildkite Plugin Bash Tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/[email protected]
-      - run: docker-compose run --rm test
-
-  py-test:
-    name: Buildkite Plugin Pytest
+    name: Pytest
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
@@ -28,7 +24,7 @@ jobs:
           test-requirements: "true"
 
       - name: Run pytest
-        run: pytest --cov deploy tests/test_deploy.py --cov-report xml:coverage-${{ env.PYTHON_VERSION }}.xml --junitxml=test-results-${{ env.PYTHON_VERSION }}.xml
+        run: pytest --cov plugin_scripts/ tests/test_deploy.py --cov-report xml:coverage-${{ env.PYTHON_VERSION }}.xml --junitxml=test-results-${{ env.PYTHON_VERSION }}.xml
 
       - name: Upload pytest test results artifact
         uses: actions/upload-artifact@v2
@@ -49,5 +45,6 @@ jobs:
       - name: Publish coverage results to Codecov
         uses: codecov/[email protected]
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: coverage-${{ env.PYTHON_VERSION }}.xml
-          fail_ci_if_error: true
+          fail_ci_if_error: true

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] - 2021-09-12
+
+### Added
+
+Inline Docker
+
 ## [0.1.0] - 2021-07-14
 
 ### Added

README.md

@@ -19,7 +19,7 @@ If the version number is not provided then the most recent version of the plugin
 ```yaml
 steps:
   - plugins:
-      - wayfair-incubator/bigquery#v0.1.0:
+      - wayfair-incubator/bigquery#v0.2.0:
           gcp_project: gcp-us-project
           dataset_schema_directory: schemas/gcp-us-project/dataset
 ```
@@ -40,14 +40,6 @@ The directory in your repository where are you storing the schemas for your tabl
 
 Example: `gcp-us-project/dataset_name`
 
-### `plugin_image_version` (optional, string)
-
-**ONLY to be used when testing feature branch changes to this plugin from another pipeline**
-
-The full hash for the latest commit to your feature branch for this plugin. This should match the plugin 'version' you are referencing in your test pipeline.
-
-Example: `1e602649cebf27b16dc45177ef1552b068fd2f8e`
-
 ## Secret
 
 This plugin expects `GCP_SERVICE_ACCOUNT` is placed as environment variable. Make sure to store it [securely](https://buildkite.com/docs/pipelines/secrets)!

docker-compose.yaml

@@ -54,6 +54,7 @@ services:
   lock-requirements:
     <<: *bigquery-buildkite-plugin
     entrypoint: "/bin/bash"
+    user: root
     command: "docker/lock_requirements.sh"
 
 volumes:

docker/devbox.dockerfile

@@ -26,6 +26,6 @@ USER ${_USER}
 COPY --chown=${UID}:${GID} ./requirements* /app/
 WORKDIR /app
 
-RUN pip install -r requirements.lock -r requirements-test.txt
+RUN pip install -r requirements.txt -r requirements-test.txt
 
 CMD bash

docker/lock_requirements.sh

@@ -2,7 +2,7 @@
 
 pip uninstall -y -r <(pip freeze)
 pip install -r requirements.txt
-printf "# THIS IS AN AUTOGENERATED LOCKFILE. DO NOT EDIT MANUALLY.\n" >requirements.lock
-pip freeze --disable-pip-version-check --all >>requirements.lock
+printf "# THIS IS AN AUTOGENERATED LOCKFILE. DO NOT EDIT MANUALLY.\n" >plugin_scripts/requirements.lock
+pip freeze --disable-pip-version-check --all >>plugin_scripts/requirements.lock
 
 echo "Rebuild containers to verify there are no conflicts."

docker/run_tests.sh

@@ -35,19 +35,19 @@ while [[ $# -gt 0 ]]; do
 done
 
 # only generate html locally
-pytest --cov deploy tests/test_deploy.py --cov-report html
+pytest --cov plugin_scripts/ tests/test_deploy.py --cov-report html
 
 echo "Running MyPy..."
-mypy deploy.py tests/test_deploy.py
+mypy plugin_scripts/deploy.py tests/test_deploy.py
 
 echo "Running black..."
-black ${BLACK_ACTION} deploy.py tests/test_deploy.py
+black ${BLACK_ACTION} plugin_scripts/deploy.py tests/test_deploy.py
 
 echo "Running iSort..."
-isort ${ISORT_ACTION} deploy.py tests/test_deploy.py
+isort ${ISORT_ACTION} plugin_scripts/deploy.py tests/test_deploy.py
 
 echo "Running flake8..."
-flake8 deploy.py tests/test_deploy.py
+flake8 plugin_scripts/deploy.py tests/test_deploy.py
 
 echo "Running bandit..."
-bandit --ini .bandit --quiet -r deploy.py
+bandit --ini .bandit --quiet -r plugin_scripts/deploy.py