Skip to content

Commit

Permalink
Merge pull request #14 from ggildong/master
Browse files Browse the repository at this point in the history
 refactor: update prowler version, modify data format, and refactor source structure to new plugin framework
  • Loading branch information
whdalsrnt authored Aug 23, 2024
2 parents 4a42453 + bf31245 commit 1887b12
Show file tree
Hide file tree
Showing 50 changed files with 1,369 additions and 2,927 deletions.
11 changes: 11 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
*.swp
*.bak
.git
.gitignore
.dockerignore
dist
build
test
*.egg-info
__pycache__
.idea
147 changes: 134 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,135 @@
*.swp
*.bak
disk
build
*.egg-info
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
tmp/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
*.whl
.idea
__pycache__
venv
local-conf.yml
.venv/
.venv.nosync/
.DS_Store
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# Test case
test_cloudservice_api.py

.idea
16 changes: 10 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
FROM python:3.9-slim
FROM python:3.10-slim

ENV PYTHONUNBUFFERED 1
ENV SPACEONE_PORT 50051
ENV SERVER_TYPE grpc
ENV PKG_DIR /tmp/pkg
ENV SRC_DIR /tmp/src

RUN apt update && apt upgrade -y
RUN apt update && apt upgrade -y && \
apt-get install gcc python3-dev -y

COPY pkg/*.txt ${PKG_DIR}/

RUN pip install --upgrade pip && \
pip install --upgrade -r ${PKG_DIR}/pip_requirements.txt
pip install --upgrade -r ${PKG_DIR}/pip_requirements.txt && \
pip install --upgrade --pre spaceone-inventory

COPY src ${SRC_DIR}
ARG CACHEBUST=1
WORKDIR ${SRC_DIR}
RUN python3 setup.py install && rm -rf /tmp/*

RUN python3 setup.py install && \
rm -rf /tmp/*

EXPOSE ${SPACEONE_PORT}

ENTRYPOINT ["spaceone"]
CMD ["run", "grpc-server", "cloudforet.plugin"]
CMD ["run", "plugin-server", "plugin"]
Empty file removed docs/en/GUIDE.md
Empty file.
Empty file removed docs/ko/GUIDE.md
Empty file.
3 changes: 2 additions & 1 deletion pkg/pip_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
spaceone-core
spaceone-api
prowler==3.15.3
prowler==4.3.3
natsort
2 changes: 1 addition & 1 deletion src/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.12
1.0.13
1 change: 0 additions & 1 deletion src/cloudforet/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion src/cloudforet/plugin/__init__.py

This file was deleted.

20 changes: 0 additions & 20 deletions src/cloudforet/plugin/conf/global_conf.py

This file was deleted.

Loading

0 comments on commit 1887b12

Please sign in to comment.