Skip to content

Commit f5d776e

Browse files
authored
feat(aws): add ability to include deprecated images (CPC-3030) (canonical#320)
1 parent 560e9de commit f5d776e

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1!5.5.0
1+
1!5.6.0

pycloudlib/ec2/cloud.py

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ def released_image(
106106
*,
107107
arch: str = "x86_64",
108108
image_type: ImageType = ImageType.GENERIC,
109+
include_deprecated: bool = False,
109110
**kwargs,
110111
):
111112
"""Find the id of the latest released image for a particular release.
@@ -121,7 +122,11 @@ def released_image(
121122
"""
122123
self._log.debug("finding released Ubuntu image for %s", release)
123124
image = self._find_latest_image(
124-
release=release, arch=arch, image_type=image_type, daily=False
125+
release=release,
126+
arch=arch,
127+
image_type=image_type,
128+
daily=False,
129+
include_deprecated=include_deprecated,
125130
)
126131
return image["ImageId"]
127132

@@ -186,7 +191,12 @@ def _get_search_filters(
186191
]
187192

188193
def _find_latest_image(
189-
self, release: str, arch: str, image_type: ImageType, daily: bool
194+
self,
195+
release: str,
196+
arch: str,
197+
image_type: ImageType,
198+
daily: bool,
199+
include_deprecated: bool = False,
190200
):
191201
filters = self._get_search_filters(
192202
release=release, arch=arch, image_type=image_type, daily=daily
@@ -196,6 +206,7 @@ def _find_latest_image(
196206
images = self.client.describe_images(
197207
Owners=[owner],
198208
Filters=filters,
209+
IncludeDeprecated=include_deprecated,
199210
)
200211

201212
if not images.get("Images"):
@@ -213,6 +224,7 @@ def daily_image(
213224
*,
214225
arch: str = "x86_64",
215226
image_type: ImageType = ImageType.GENERIC,
227+
include_deprecated: bool = False,
216228
**kwargs,
217229
):
218230
"""Find the id of the latest daily image for a particular release.
@@ -227,7 +239,11 @@ def daily_image(
227239
"""
228240
self._log.debug("finding daily Ubuntu image for %s", release)
229241
image = self._find_latest_image(
230-
release=release, arch=arch, image_type=image_type, daily=True
242+
release=release,
243+
arch=arch,
244+
image_type=image_type,
245+
daily=True,
246+
include_deprecated=include_deprecated,
231247
)
232248
return image["ImageId"]
233249

0 commit comments

Comments
 (0)