portability: patch mac os dns issues

.github/workflows/test_fast.yml

@@ -44,9 +44,6 @@ jobs:
       - name: Brew Install
         if: startsWith(matrix.os, 'macos')
         run: |
-          # apply DNS patch
-          patch cylc/flow/hostuserutil.py < etc/conf/macos-patch
-
           brew update
           brew install shellcheck sqlite3 bash coreutils
 

.github/workflows/test_functional.yml

@@ -92,9 +92,6 @@ jobs:
       - name: Brew Install
         if: startsWith(matrix.os, 'macos')
         run: |
-          # apply DNS patch
-          patch cylc/flow/hostuserutil.py < etc/conf/macos-patch
-
           # install system deps
           brew update
           brew install bash coreutils gnu-sed

CHANGES.md

@@ -102,6 +102,9 @@ respectively.
 
 ### Fixes
 
+[#4296](https://github.com/cylc/cylc-flow/pull/4296) -
+Patches DNS issues with newer versions of Mac OS.
+
 [#4273](https://github.com/cylc/cylc-flow/pull/4273)
  - Remove obsolete Cylc 7 visualization config section.
 

cylc/flow/hostuserutil.py

@@ -44,15 +44,19 @@
 
 """
 
+from contextlib import suppress
 import os
 import pwd
 import socket
-from contextlib import suppress
+import sys
 from time import time
 
 from cylc.flow.cfgspec.glbl_cfg import glbl_cfg
 
 
+IS_MAC_OS = 'darwin' in sys.platform.lower()
+
+
 class HostUtil:
     """host and user ID utility."""
 
@@ -114,6 +118,19 @@ def _get_host_info(self, target=None):
         if target not in self._host_exs:
             if target is None:
                 target = socket.getfqdn()
+            if (
+                IS_MAC_OS
+                and target == (
+                    '1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.'
+                    '0.0.0.0.0.0.ip6.arpa'
+                )
+            ):
+                # Python's socket bindings don't play nicely with mac os
+                # so by default we get the above ip6.arpa adresss from
+                # socket.getfqdn, note this does *not* match `hostname -f`.
+                # https://github.com/cylc/cylc-flow/issues/2689
+                # https://github.com/cylc/cylc-flow/issues/3595
+                target = socket.gethostname()
             try:
                 self._host_exs[target] = socket.gethostbyname_ex(target)
             except IOError as exc: