Merge pull request #88 from defanator/1.8.1

Update agent version to 1.8.1

Author: defanator

amplify/agent/common/context.py

@@ -37,8 +37,8 @@ def __init__(self):
 
  # define vars
  self.cpu_last_check = 0
- self.version_semver = (1, 8, 0)
- self.version_build = 2
+ self.version_semver = (1, 8, 1)
+ self.version_build = 1
  self.uuid = None
  self.version = '%s-%s' % ('.'.join(map(str, self.version_semver)), self.version_build)
  self.environment = None

amplify/agent/objects/nginx/config/parser.py

@@ -66,7 +66,7 @@ def _iglob_pattern(pattern):
 
 
 def _getline(filename, lineno):
- with open(filename, encoding='utf-8') as fp:
+ with open(filename, encoding='utf-8', errors='replace') as fp:
  for i, line in enumerate(fp, start=1):
  if i == lineno:
  return line.rstrip('\r\n')
@@ -114,7 +114,7 @@ def _handle_error(self, path, e, is_dir=False, exc_info=True, what='read'):
  :param what: str - what action caused the error (used for logging)
  """
  exc_cls = e.__class__.__name__
- exc_msg = e.strerror if hasattr(e, 'strerror') else e.message
+ exc_msg = e.strerror if hasattr(e, 'strerror') else str(e)
  message = 'failed to %s %s due to: %s' % (what, path, exc_cls)
  self.errors.append(message)
  if is_dir:
@@ -145,7 +145,7 @@ def _add_file(self, filename):
  self._add_directory(dirname, check=True)
  try:
  info = get_filesystem_info(filename)
- info['lines'] = open(filename, encoding='utf-8').read().count('\n')
+ info['lines'] = open(filename, encoding='utf-8', errors='replace').read().count('\n')
  self.files[filename] = info
  except Exception as e:
  self._handle_error(filename, e, is_dir=False)
@@ -337,7 +337,7 @@ def _skim_file(filename):
  yield filename
  try:
  # search each line for include or ssl_certificate directives
- with open(filename, encoding='utf-8') as lines:
+ with open(filename, encoding='utf-8', errors='replace') as lines:
  for line in lines:
  if not has_directive(line):
  continue

packages/nginx-amplify-agent/deb/debian/changelog

@@ -1,3 +1,10 @@
+nginx-amplify-agent (1.8.1-1) stable; urgency=low
+
+ * crossplane updated to 0.5.8
+ * fixed parsing of non-Unicode nginx configurations
+
+ -- Andrei Belov <a.belov@f5.com> Fri, 23 Sep 2022 15:22:10 +0400
+
 nginx-amplify-agent (1.8.0-2) stable; urgency=low
 
  * Bug fixes

packages/nginx-amplify-agent/requirements-amzn2.txt

@@ -3,7 +3,7 @@ greenlet==0.4.14
 netifaces==0.10.4
 netaddr==0.8.0
 flup==1.0.3
-crossplane==0.5.7
+crossplane==0.5.8
 rstr==3.0.0
 psutil==5.8.0
 python-daemon==2.2.4

packages/nginx-amplify-agent/requirements-debian10.txt

@@ -1,6 +1,6 @@
 netaddr==0.8.0
 flup==1.0.3
-crossplane==0.5.7
+crossplane==0.5.8
 rstr==3.0.0
 psutil==5.8.0
 python-daemon==2.2.4

packages/nginx-amplify-agent/requirements-debian11.txt

@@ -1,4 +1,4 @@
 netaddr==0.8.0
 flup==1.0.3
-crossplane==0.5.7
+crossplane==0.5.8
 rstr==3.0.0

packages/nginx-amplify-agent/requirements-py310.txt

@@ -3,7 +3,7 @@ greenlet==1.1.1
 netifaces==0.11.0
 netaddr==0.8.0
 flup==1.0.3
-crossplane==0.5.7
+crossplane==0.5.8
 rstr==3.0.0
 psutil==5.8.0
 python-daemon==2.2.4

packages/nginx-amplify-agent/requirements-py39.txt

@@ -3,7 +3,7 @@ greenlet==1.0.0
 netifaces==0.11.0
 netaddr==0.8.0
 flup==1.0.3
-crossplane==0.5.7
+crossplane==0.5.8
 rstr==3.0.0
 psutil==5.8.0
 python-daemon==2.2.4

packages/nginx-amplify-agent/requirements-rhel8.txt

@@ -1,6 +1,6 @@
 netaddr==0.8.0
 flup==1.0.3
-crossplane==0.5.7
+crossplane==0.5.8
 rstr==3.0.0
 psutil==5.8.0
 python-daemon==2.2.4

packages/nginx-amplify-agent/requirements-ubuntu1804.txt

@@ -1,6 +1,6 @@
 netaddr==0.8.0
 flup==1.0.3
-crossplane==0.5.7
+crossplane==0.5.8
 rstr==3.0.0
 psutil==5.8.0
 python-daemon==2.2.4