Skip to content

Commit

Permalink
Merge pull request #55 from jinyoungmoonDEV/master
Browse files Browse the repository at this point in the history
fix: fix boto3 version issue
  • Loading branch information
jinyoungmoonDEV authored Dec 5, 2024
2 parents 549a079 + 57fb914 commit 7214f1e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions pkg/pip_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
spaceone-core
spaceone-api
spaceone-api
boto3
7 changes: 6 additions & 1 deletion src/plugin/manager/ec2/snapshot_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
author_email="[email protected]",
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",
Expand Down

0 comments on commit 7214f1e

Please sign in to comment.