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.

Sign up for GitHub

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

Jump to bottom

Include c7n awscc in image #9521

Merged
merged 11 commits into from
Jun 2, 2024
Merged

Include c7n awscc in image #9521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
df3c745
chore: include c7n awscc in image
syed-awais-ali May 20, 2024
110de5c
fix: add space
syed-awais-ali May 20, 2024
2264a78
fix: pass linting test
syed-awais-ali May 20, 2024
8587839
Merge branch 'main' into include_c7n_awscc
syed-awais-ali May 21, 2024
ec70714
chore: generate the dockerfiles
syed-awais-ali May 21, 2024
75b156f
Merge branch 'main' into include_c7n_awscc
syed-awais-ali May 22, 2024
5da05d2
fix: docer tests
syed-awais-ali May 22, 2024
9d290f9
Merge branch 'main' into include_c7n_awscc
syed-awais-ali May 23, 2024
f97d44d
Merge branch 'main' into include_c7n_awscc
syed-awais-ali May 27, 2024
43d1d71
Merge branch 'main' into include_c7n_awscc
syed-awais-ali Jun 1, 2024
e08f4ff
remove extraneous target
kapilt Jun 2, 2024
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
14 changes: 13 additions & 1 deletion docker/c7n
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

FROM ubuntu:22.04
Expand Down
14 changes: 13 additions & 1 deletion docker/c7n-distroless
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

FROM gcr.io/distroless/python3-debian10
Expand Down
14 changes: 13 additions & 1 deletion docker/c7n-kube
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

# Install c7n-kube
Expand Down
14 changes: 13 additions & 1 deletion docker/c7n-kube-distroless
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

# Install c7n-kube
Expand Down
14 changes: 13 additions & 1 deletion docker/c7n-org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

# Install c7n-org
Expand Down
14 changes: 13 additions & 1 deletion docker/c7n-org-distroless
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

# Install c7n-org
Expand Down
14 changes: 13 additions & 1 deletion docker/mailer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

# Install c7n-mailer
Expand Down
14 changes: 13 additions & 1 deletion docker/mailer-distroless
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

# Install c7n-mailer
Expand Down
14 changes: 13 additions & 1 deletion docker/policystream
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

# Install c7n-policystream
Expand Down
14 changes: 13 additions & 1 deletion docker/policystream-distroless
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN . /usr/local/bin/activate && poetry install --without dev --no-root
ADD c7n /src/c7n/
RUN . /usr/local/bin/activate && poetry install --only-root

ARG providers="gcp azure kube openstack tencentcloud oci"
ARG providers="gcp azure kube openstack tencentcloud oci awscc"
# Add provider packages
# We include `pyproject.toml` and `poetry.lock` first to allow
# cache of dependency installs.
Expand Down Expand Up @@ -55,6 +55,10 @@ ADD tools/c7n_oci/pyproject.toml tools/c7n_oci/poetry.lock /src/tools/c7n_oci/
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --without dev --no-root; fi


ADD tools/c7n_awscc/pyproject.toml tools/c7n_awscc/poetry.lock /src/tools/c7n_awscc/
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --without dev --no-root; fi


# Now install the root of each provider

ADD tools/c7n_gcp /src/tools/c7n_gcp
Expand All @@ -81,6 +85,14 @@ ADD tools/c7n_oci /src/tools/c7n_oci
RUN if [[ " ${providers[*]} " =~ "oci" ]]; then . /usr/local/bin/activate && cd tools/c7n_oci && poetry install --only-root; fi


ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN if [[ " ${providers[*]} " =~ "awscc" ]]; then . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install --only-root; fi


# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output

# Install c7n-policystream
Expand Down
2 changes: 1 addition & 1 deletion tests/test_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def test_image_metadata(image_name):
def test_cli_providers_available():
providers = os.environ.get("CUSTODIAN_PROVIDERS", None)
if providers is None:
providers = {"aws", "azure", "gcp", "k8s", "openstack", "tencentcloud", "oci"}
providers = {"aws", "azure", "gcp", "k8s", "openstack", "tencentcloud", "oci", "awscc"}
elif providers == "":
providers = {"aws"}
else:
Expand Down
12 changes: 11 additions & 1 deletion tools/dev/dockerpkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
fi
"""

default_providers = ["gcp", "azure", "kube", "openstack", "tencentcloud", "oci"]
default_providers = ["gcp", "azure", "kube", "openstack", "tencentcloud", "oci", "awscc"]

PHASE_1_PKG_INSTALL_DEP = """\
# We include `pyproject.toml` and `poetry.lock` first to allow
Expand Down Expand Up @@ -113,6 +113,10 @@

{PHASE_2_PKG_INSTALL_ROOT}

# Install c7n_awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install

RUN mkdir /output
"""

Expand Down Expand Up @@ -229,6 +233,12 @@
LABEL "org.opencontainers.image.documentation"="https://cloudcustodian.io/docs"
"""

BUILD_AWSCC = """\
# Install c7n-awscc
ADD tools/c7n_awscc /src/tools/c7n_awscc
RUN . /usr/local/bin/activate && cd tools/c7n_awscc && poetry install
"""


class Image:

Expand Down