Merge pull request #498 from linode/dev

v5.41.3

Author: jriddle-linode

.github/workflows/docker-build.yml

@@ -0,0 +1,20 @@
+name: Docker Image Build CI
+
+on:
+  push:
+    branches: [ "dev", "main" ]
+  pull_request:
+    branches: [ "dev", "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag linode/cli:$(date +%s) --build-arg="github_token=$GITHUB_TOKEN"
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/nightly-smoke-tests.yml

@@ -0,0 +1,35 @@
+name: Nightly Smoke Tests
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  smoke_tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: dev
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Install Python deps
+        run: pip install -r requirements.txt -r requirements-dev.txt wheel boto3
+
+      - name: Install Linode CLI
+        run: make install
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run smoke tests
+        run: |
+          make smoketest
+        env:
+          LINODE_CLI_TOKEN: ${{ secrets.LINODE_TOKEN_2 }}

.github/workflows/oci-build.yml

@@ -17,13 +17,13 @@ jobs:
           python-version: '3.x'
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # pin@v2
+        uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # pin@v2.2.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # pin@v2
+        uses: docker/setup-buildx-action@ecf95283f03858871ff00b787d79c419715afc34 # pin@v2.7.0
 
       - name: Login to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # pin@v2
+        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # pin@v2.2.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -40,10 +40,10 @@ jobs:
         id: cli_version
 
       - name: Build and push to DockerHub
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # pin@v3
+        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # pin@v4.1.1
         with:
           context: .
-          file: Dockerfile-release
+          file: Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: linode/cli:${{ steps.cli_version.outputs.CLI_VERSION }},linode/cli:latest

.github/workflows/publish-pypi.yml

@@ -34,6 +34,6 @@ jobs:
           LINODE_CLI_VERSION: ${{ github.event.release.tag_name }}
 
       - name: Publish the release artifacts to PyPI
-        uses: pypa/gh-action-pypi-publish@37f50c210e3d2f9450da2cd423303d6a14a6e29f # pin@release/v1
+        uses: pypa/gh-action-pypi-publish@a56da0b891b3dc519c7ee3284aff1fad93cc8598 # pin@release/v1.8.6
         with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
+          password: ${{ secrets.PYPI_API_TOKEN }}

CODEOWNERS

@@ -0,0 +1,2 @@
+* @linode/dx
+

Dockerfile

@@ -1,21 +1,28 @@
-FROM python:2-slim
+FROM python:3.11-slim AS builder
 
-ENV PYTHONPATH=.
-ENV PATH="/usr/local/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/bin"
-
-RUN apt-get update && apt-get install -y git python3 python3-pip \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /var/cache/apt/*
+ARG linode_cli_version
+ARG github_token
 
 WORKDIR /src
 
 COPY requirements.txt .
 
-RUN pip install -r requirements.txt \
-    && pip3 install -r requirements.txt \
-    && pip install twine
+RUN apt-get update && \
+    apt-get install -y make git && \
+    pip3 install -r requirements.txt && \
+    pip3 install build
 
 COPY . .
 
-# Build and Install the Linode CLI
-ENTRYPOINT ["make", "build"]
+RUN LINODE_CLI_VERSION=$linode_cli_version GITHUB_TOKEN=$github_token make build
+
+FROM python:3.11-slim
+
+COPY --from=builder /src/dist /dist
+
+RUN pip3 install /dist/*.whl boto3
+
+RUN useradd -ms /bin/bash cli
+USER cli:cli
+
+ENTRYPOINT ["linode-cli"]

Dockerfile-bats

@@ -14,26 +14,27 @@ ifndef SPEC
 override SPEC = $(shell ./resolve_spec_url ${SPEC_VERSION})
 endif
 
+.PHONY: install
 install: check-prerequisites requirements build
 	pip3 install --force dist/*.whl
 
 .PHONY: build
 build: clean
 	python3 -m linodecli bake ${SPEC} --skip-config
 	cp data-3 linodecli/
-	python3 setup.py bdist_wheel
-	python3 setup.py sdist
+	python3 -m build --wheel --sdist
 
 .PHONY: requirements
 requirements:
-	pip3 install -r requirements.txt
+	pip3 install -r requirements.txt -r requirements-dev.txt
 
-.PHONY: requirements
-lint:
+.PHONY: lint
+lint: build
 	pylint linodecli
 	isort --check-only linodecli tests
 	autoflake --check linodecli tests
 	black --check --verbose linodecli tests
+	twine check dist/*
 
 .PHONY: check-prerequisites
 check-prerequisites:
@@ -64,13 +65,21 @@ testall:
 .PHONY: test
 test: testunit
 
+.PHONY: black
 black:
 	black linodecli tests
 
+.PHONY: isort
 isort:
 	isort linodecli tests
 
+.PHONY: autoflake
 autoflake:
 	autoflake linodecli tests
 
+.PHONY: format
 format: black isort autoflake
+
+@PHONEY: smoketest
+smoketest:
+	pytest -m smoke tests/integration --disable-warnings

Dockerfile-release

@@ -68,6 +68,8 @@ def main():  # pylint: disable=too-many-branches,too-many-statements
         cli.output_handler.columns = "*"
     elif parsed.markdown:
         cli.output_handler.mode = OutputMode.markdown
+    elif parsed.ascii_table:
+        cli.output_handler.mode = OutputMode.ascii_table
 
     if parsed.delimiter:
         cli.output_handler.delimiter = parsed.delimiter