awsebcli 3.23__tar.gz → 3.23.2__tar.gz

{awsebcli-3.23 → awsebcli-3.23.2}/CHANGES.rst

@@ -1,6 +1,17 @@
 
 Changelog
 =========
+--------------------
+3.23.2 (2025-04-22)
+--------------------
+- Fixed bug in Python 3.8 due to incompatible type specification
+- Fixed bug that caused omission of symlinks-to-directories during application version creation
+
+--------------------
+3.23.1 (2025-04-18)
+--------------------
+- Handle `eb migrate` execution failures on non-Windows machines gracefully
+
 --------------------
 3.23 (2025-04-18)
 --------------------

{awsebcli-3.23/awsebcli.egg-info → awsebcli-3.23.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awsebcli
-Version: 3.23
+Version: 3.23.2
 Summary: Command Line Interface for AWS EB.
 Home-page: http://aws.amazon.com/elasticbeanstalk/
 Author: AWS Elastic Beanstalk
@@ -125,6 +125,17 @@ in the *AWS Elastic Beanstalk Developer Guide*.
 
 Changelog
 =========
+--------------------
+3.23.2 (2025-04-22)
+--------------------
+- Fixed bug in Python 3.8 due to incompatible type specification
+- Fixed bug that caused omission of symlinks-to-directories during application version creation
+
+--------------------
+3.23.1 (2025-04-18)
+--------------------
+- Handle `eb migrate` execution failures on non-Windows machines gracefully
+
 --------------------
 3.23 (2025-04-18)
 --------------------

{awsebcli-3.23 → awsebcli-3.23.2/awsebcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awsebcli
-Version: 3.23
+Version: 3.23.2
 Summary: Command Line Interface for AWS EB.
 Home-page: http://aws.amazon.com/elasticbeanstalk/
 Author: AWS Elastic Beanstalk
@@ -125,6 +125,17 @@ in the *AWS Elastic Beanstalk Developer Guide*.
 
 Changelog
 =========
+--------------------
+3.23.2 (2025-04-22)
+--------------------
+- Fixed bug in Python 3.8 due to incompatible type specification
+- Fixed bug that caused omission of symlinks-to-directories during application version creation
+
+--------------------
+3.23.1 (2025-04-18)
+--------------------
+- Handle `eb migrate` execution failures on non-Windows machines gracefully
+
 --------------------
 3.23 (2025-04-18)
 --------------------

{awsebcli-3.23 → awsebcli-3.23.2}/ebcli/__init__.py

@@ -11,4 +11,4 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-__version__ = '3.23'
+__version__ = '3.23.2'

{awsebcli-3.23 → awsebcli-3.23.2}/ebcli/controllers/migrate.py

@@ -64,6 +64,7 @@ from ebcli.objects.platform import PlatformVersion
 from ebcli.objects.exceptions import (
     NotFoundError,
     NotAnEC2Instance,
+    NotSupportedError,
 )
 from ebcli.resources.strings import prompts, flag_text
 from ebcli.operations import commonops, createops, platformops, statusops
@@ -81,6 +82,8 @@ class MigrateExploreController(AbstractBaseController):
         stacked_type = "nested"
 
     def do_command(self):
+        if not sys.platform.startswith("win"):
+            raise NotSupportedError("'eb migrate explore' is only supported on Windows")
         verbose = self.app.pargs.verbose
 
         if verbose:
@@ -102,6 +105,8 @@ class MigrateCleanupController(AbstractBaseController):
         ]
 
     def do_command(self):
+        if not sys.platform.startswith("win"):
+            raise NotSupportedError("'eb migrate cleanup' is only supported on Windows")
         force = self.app.pargs.force
         cleanup_previous_migration_artifacts(force, self.app.pargs.verbose)
 
@@ -274,6 +279,8 @@ class MigrateController(AbstractBaseController):
             json.dump(manifest_contents, file, indent=4)
 
     def do_command(self):
+        if not sys.platform.startswith("win"):
+            raise NotSupportedError("'eb migrate' is only supported on Windows")
         validate_iis_version_greater_than_7_0()
         verbose = self.app.pargs.verbose
 
@@ -375,7 +382,7 @@ class MigrateController(AbstractBaseController):
                 listener_configs_json = {"listener_configs": listener_configs}
                 json.dump(listener_configs_json, file, indent=2)
         if archive_only and upload_target_dir:
-            generate_upload_target_archive(upload_target_dir, env_name)
+            generate_upload_target_archive(upload_target_dir, env_name, region)
             return
 
         self.create_app_version_and_environment(
@@ -572,7 +579,7 @@ def establish_instance_profile(instance_profile):
     return instance_profile
 
 
-def generate_upload_target_archive(upload_target_dir, env_name):
+def generate_upload_target_archive(upload_target_dir, env_name, region):
     fileoperations.zip_up_folder(upload_target_dir, upload_target_zip_path())
     relative_normalized_upload_target_dir_path = absolute_to_relative_normalized_path(
         upload_target_dir
@@ -583,13 +590,13 @@ def generate_upload_target_archive(upload_target_dir, env_name):
         io.echo(
             f"\nGenerated destination archive ZIP at .\\{relative_normalized_upload_target_dir_path}.zip. "
             "You can now upload the zip using:\n\n"
-            "    eb deploy --zip .\\migrations\\latest\\upload_target.zip\n"
+            f"    eb deploy {env_name} --archive .\\migrations\\latest\\upload_target.zip --region {region}\n"
         )
     except NotFoundError:
         io.echo(
             f"\nGenerated destination archive directory at .\\{relative_normalized_upload_target_dir_path}.zip. "
             "You can create en environment with the zip using:\n\n"
-            "    eb migrate --archive .\\migrations\\latest\\upload_target.zip\n"
+            f"    eb migrate --environment-name {env_name} --archive .\\migrations\\latest\\upload_target.zip --region {region}\n"
         )
 
 
@@ -2667,8 +2674,8 @@ def get_listener_configs(sites: List["Site"], ssl_certificate_domain_name: str =
 
 
 def _create_process_option_settings(
-    process_protocol_mappings: dict[str, str],
-) -> list[dict]:
+    process_protocol_mappings: Dict[str, str],
+) -> List[dict]:
     """
     Create Elastic Beanstalk process option settings from process-protocol mappings.
 
@@ -2729,7 +2736,7 @@ def _create_process_option_settings(
 
 def _create_listener_settings(
     namespace: str, option_name_value_pairs: List[Tuple[str, str]]
-) -> list[dict]:
+) -> List[dict]:
     """
     Create Elastic Beanstalk listener option settings from name-value pairs.
 
@@ -2751,7 +2758,7 @@ def _create_listener_settings(
 
 def _create_http_listener_settings(
     default_process_name: str, rule_names: str
-) -> list[dict]:
+) -> List[dict]:
     """
     Create HTTP listener configuration settings for Elastic Beanstalk.
 
@@ -2781,7 +2788,7 @@ def _create_http_listener_settings(
 
 def _create_https_listener_settings(
     default_process_name: str, rule_names: str, ssl_cert: str
-) -> list[dict]:
+) -> List[dict]:
     """
     Create HTTPS listener configuration settings for Elastic Beanstalk.
 
@@ -2812,12 +2819,12 @@ def _create_https_listener_settings(
     return _create_listener_settings("aws:elbv2:listener:443", option_name_value_pairs)
 
 
-def _extract_and_join_rule_names(option_settings: list[dict]) -> str:
+def _extract_and_join_rule_names(option_settings: List[dict]) -> str:
     rule_names = {option["Namespace"].split(":")[-1] for option in option_settings}
     return ",".join(sorted(rule_names))
 
 
-def _extract_process_values(option_settings: list[dict]) -> set[str]:
+def _extract_process_values(option_settings: List[dict]) -> Set[str]:
     return {
         setting["Value"]
         for setting in option_settings
@@ -3234,7 +3241,7 @@ def _process_url_rewrite_rule(rule, processed_patterns, site, target_groups, iis
 
 
 def _create_rewrite_rule(
-    conditions: List[Dict[str, str | List[str]]], target_group_arn: str, protocol: str
+    conditions: List[Dict[str, Union[str , List[str]]]], target_group_arn: str, protocol: str
 ) -> Dict[str, Any]:
     return {
         "Conditions": conditions,

{awsebcli-3.23 → awsebcli-3.23.2}/ebcli/core/fileoperations.py

@@ -18,13 +18,13 @@ import os
 import shutil
 import stat
 import sys
-import warnings
-import yaml
 import zipfile
+import yaml
+import warnings
+from pathspec import PathSpec
 
 from cement.utils.misc import minimal_logger
 from ebcli.objects.buildconfiguration import BuildConfiguration
-from pathspec import PathSpec
 from six import StringIO
 from yaml import safe_load, safe_dump
 from yaml.parser import ParserError
@@ -431,6 +431,21 @@ def _zipdir(path, zipf, ignore_list=None):
         if '.elasticbeanstalk' in root:
             io.log_info('  -skipping: {}'.format(root))
             continue
+        for d in dirs:
+            cur_dir = os.path.join(root, d)
+            if os.path.islink(cur_dir):
+                # os.walk categorize symlinks-to-directories as dirs
+                # and we want to include symlinks in the zip
+                if cur_dir in ignore_list:
+                    io.log_info(' -skipping: {}'.format(cur_dir))
+                else:
+                    zipInfo = zipfile.ZipInfo()
+                    zipInfo.filename = os.path.join(root, d)
+
+                    # 2716663808L is the "magic code" for symlinks
+                    zipInfo.external_attr = 2716663808 if sys.version_info > (3,) else long(2716663808)
+
+                    zipf.writestr(zipInfo, os.readlink(cur_dir))
         for f in files:
             cur_file = os.path.join(root, f)