Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix warning messages from slowapi and docker #5385

Merged
merged 6 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ The types of changes are:
- Fixed a bug where D&D tables were rendering stale data [#5372](https://github.com/ethyca/fides/pull/5372)
- Fixed issue where Dataset with nested fields was unable to edit Categories [#5383](https://github.com/ethyca/fides/pull/5383)

### Developer Experience
- Fix warning messages from slowapi and docker [#5385](https://github.com/ethyca/fides/pull/5385)

## [2.47.0](https://github.com/ethyca/fidesplus/compare/2.46.2...2.47.0)

Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG PYTHON_VERSION="3.10.13"
#########################
## Compile Python Deps ##
#########################
FROM python:${PYTHON_VERSION}-slim-bookworm as compile_image
FROM python:${PYTHON_VERSION}-slim-bookworm AS compile_image


# Install auxiliary software
Expand Down Expand Up @@ -55,7 +55,7 @@ RUN pip install --no-cache-dir -r dev-requirements.txt
##################
## Backend Base ##
##################
FROM python:${PYTHON_VERSION}-slim-bookworm as backend
FROM python:${PYTHON_VERSION}-slim-bookworm AS backend

# Add the fidesuser user but don't switch to it yet
RUN addgroup --system --gid 1001 fidesgroup
Expand Down Expand Up @@ -99,7 +99,7 @@ CMD [ "fides", "webserver" ]
#############################
## Development Application ##
#############################
FROM backend as dev
FROM backend AS dev

USER root

Expand All @@ -110,7 +110,7 @@ USER fidesuser
###################
## Frontend Base ##
###################
FROM node:20-alpine as frontend
FROM node:20-alpine AS frontend

RUN apk add --no-cache libc6-compat
# Build the frontend clients
Expand All @@ -127,7 +127,7 @@ COPY clients/ .
####################
## Built frontend ##
####################
FROM frontend as built_frontend
FROM frontend AS built_frontend

# Builds and exports admin-ui
RUN npm run export-admin-ui
Expand All @@ -137,7 +137,7 @@ RUN npm run build-privacy-center
###############################
## Production Privacy Center ##
###############################
FROM node:20-alpine as prod_pc
FROM node:20-alpine AS prod_pc

WORKDIR /fides/clients

Expand All @@ -158,7 +158,7 @@ CMD ["npm", "run", "start"]
############################
## Production Application ##
############################
FROM backend as prod
FROM backend AS prod

# Copy frontend build over
COPY --from=built_frontend /fides/clients/admin-ui/out/ /fides/src/fides/ui-build/static/admin
Expand Down
2 changes: 1 addition & 1 deletion clients/sample-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20-alpine as prod
FROM node:20-alpine AS prod

RUN mkdir /home/node/app
WORKDIR /home/node/app
Expand Down
4 changes: 2 additions & 2 deletions docs/fides/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.13-slim-bookworm as build
FROM python:3.10.13-slim-bookworm AS build

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand Down Expand Up @@ -31,7 +31,7 @@ COPY . .
RUN pip install -U pip && pip install . && pip install -r docs/fides/requirements.txt


FROM python:3.10.13-slim-bookworm as docs
FROM python:3.10.13-slim-bookworm AS docs
RUN apt-get update && \
apt-get install -y --no-install-recommends \
git \
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ redis==3.5.3
rich-click==1.6.1
sendgrid==6.9.7
scylla-driver==3.26.8
slowapi==0.1.8
slowapi==0.1.9
snowflake-sqlalchemy==1.5.1
sqlalchemy[asyncio]==1.4.27
sqlalchemy-citext==1.8.0
Expand Down
9 changes: 9 additions & 0 deletions tests/ctl/cli/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,15 @@ def test_commands_print_help_text_even_on_invalid(
assert "Usage: fides user permissions [OPTIONS]" in result.output


@pytest.mark.unit
def test_cli_version(test_cli_runner: CliRunner) -> None:
result = test_cli_runner.invoke(cli, ["--version"])
import fides

assert f"fides, version {fides.__version__}" in result.output
assert result.exit_code == 0


class TestView:
@pytest.mark.unit
def test_view_config(self, test_cli_runner: CliRunner) -> None:
Expand Down
Loading