diff --git a/Dockerfile b/Dockerfile index 61f80ab..4b62897 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM cloudforet/python-core:2.0 -ENV PYTHONUNBUFFERED 1 -ENV SPACEONE_PORT 50051 -ENV SERVER_TYPE grpc -ENV PKG_DIR /tmp/pkg -ENV SRC_DIR /tmp/src +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 diff --git a/pkg/pip_requirements.txt b/pkg/pip_requirements.txt index fc9497f..165f17c 100644 --- a/pkg/pip_requirements.txt +++ b/pkg/pip_requirements.txt @@ -1,2 +1,2 @@ -spaceone-core -spaceone-api \ No newline at end of file +spaceone-api +boto3 \ No newline at end of file diff --git a/src/plugin/manager/ec2/snapshot_manager.py b/src/plugin/manager/ec2/snapshot_manager.py index 19608a8..d7ce8b4 100644 --- a/src/plugin/manager/ec2/snapshot_manager.py +++ b/src/plugin/manager/ec2/snapshot_manager.py @@ -43,7 +43,6 @@ def create_cloud_service(self, region, options, secret_data, schema): try: if name := self._get_name_from_tags(raw.get("Tags", [])): raw["name"] = name - raw.update( { "cloudtrail": self.set_cloudtrail( @@ -67,10 +66,16 @@ def create_cloud_service(self, region, options, secret_data, schema): } ) + print(type(raw.get("StartTime"))) self._update_times(raw) + print(raw.get("StartTime")) + print(type(raw.get("StartTime"))) snapshot_vo = raw + print(type(snapshot_vo.get("StartTime"))) + print(f"DATA : {snapshot_vo}") + resource_id = snapshot_vo.get("arn", "") snapshot_id = snapshot_vo.get("SnapshotId", "") link = f"https://console.aws.amazon.com/ec2/v2/home?region={region}#Snapshots:visibility=owned-by-me;snapshotId={snapshot_id};sort=snapshotId" diff --git a/src/setup.py b/src/setup.py index cf5233c..f768091 100644 --- a/src/setup.py +++ b/src/setup.py @@ -30,7 +30,7 @@ author_email="admin@spaceone.dev", license="Apache License 2.0", packages=find_packages(), - install_requires=["spaceone-core", "spaceone-api", "spaceone-inventory"], + install_requires=["spaceone-api", "spaceone-inventory"], package_data={ "plugin": [ "metadata/**/*.yaml",