Skip to content

Commit

Permalink
Stability improvments.
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexdlaird
alexdlaird committed Nov 28, 2022
1 parent bf1935f commit e5d8905
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 31 deletions.
56 changes: 28 additions & 28 deletions pyngrok/installer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,33 @@

logger = logging.getLogger(__name__)

CDN_URL_PREFIX = "https://bin.equinox.io/c/bNyj1mQVY4c/"
CDN_V2_URL_PREFIX = "https://bin.equinox.io/c/4VmDzA7iaHb/"
CDN_URL_PREFIX = "https://bin.equinox.io/c/4VmDzA7iaHb/"
CDN_V3_URL_PREFIX = "https://bin.equinox.io/c/bNyj1mQVY4c/"
PLATFORMS = {
"darwin_x86_64": CDN_URL_PREFIX + "ngrok-v3-stable-darwin-amd64.zip",
"darwin_x86_64_arm": CDN_URL_PREFIX + "ngrok-v3-stable-darwin-arm64.zip",
"windows_x86_64": CDN_URL_PREFIX + "ngrok-v3-stable-windows-amd64.zip",
"windows_i386": CDN_URL_PREFIX + "ngrok-v3-stable-windows-386.zip",
"linux_x86_64_arm": CDN_URL_PREFIX + "ngrok-v3-stable-linux-arm64.zip",
"linux_i386_arm": CDN_URL_PREFIX + "ngrok-v3-stable-linux-arm.zip",
"linux_i386": CDN_URL_PREFIX + "ngrok-v3-stable-linux-386.zip",
"linux_x86_64": CDN_URL_PREFIX + "ngrok-v3-stable-linux-amd64.zip",
"freebsd_x86_64": CDN_URL_PREFIX + "ngrok-v3-stable-freebsd-amd64.zip",
"freebsd_i386": CDN_URL_PREFIX + "ngrok-v3-stable-freebsd-386.zip",
"cygwin_x86_64": CDN_URL_PREFIX + "ngrok-v3-stable-windows-amd64.zip",
"darwin_x86_64": CDN_URL_PREFIX + "ngrok-stable-darwin-amd64.zip",
"darwin_x86_64_arm": CDN_URL_PREFIX + "ngrok-stable-darwin-arm64.zip",
"windows_x86_64": CDN_URL_PREFIX + "ngrok-stable-windows-amd64.zip",
"windows_i386": CDN_URL_PREFIX + "ngrok-stable-windows-386.zip",
"linux_x86_64_arm": CDN_URL_PREFIX + "ngrok-stable-linux-arm64.zip",
"linux_i386_arm": CDN_URL_PREFIX + "ngrok-stable-linux-arm.zip",
"linux_i386": CDN_URL_PREFIX + "ngrok-stable-linux-386.zip",
"linux_x86_64": CDN_URL_PREFIX + "ngrok-stable-linux-amd64.zip",
"freebsd_x86_64": CDN_URL_PREFIX + "ngrok-stable-freebsd-amd64.zip",
"freebsd_i386": CDN_URL_PREFIX + "ngrok-stable-freebsd-386.zip",
"cygwin_x86_64": CDN_URL_PREFIX + "ngrok-stable-windows-amd64.zip",
}
PLATFORMS_V2 = {
"darwin_x86_64": CDN_V2_URL_PREFIX + "ngrok-stable-darwin-amd64.zip",
"darwin_x86_64_arm": CDN_V2_URL_PREFIX + "ngrok-stable-darwin-arm64.zip",
"windows_x86_64": CDN_V2_URL_PREFIX + "ngrok-stable-windows-amd64.zip",
"windows_i386": CDN_V2_URL_PREFIX + "ngrok-stable-windows-386.zip",
"linux_x86_64_arm": CDN_V2_URL_PREFIX + "ngrok-stable-linux-arm64.zip",
"linux_i386_arm": CDN_V2_URL_PREFIX + "ngrok-stable-linux-arm.zip",
"linux_i386": CDN_V2_URL_PREFIX + "ngrok-stable-linux-386.zip",
"linux_x86_64": CDN_V2_URL_PREFIX + "ngrok-stable-linux-amd64.zip",
"freebsd_x86_64": CDN_V2_URL_PREFIX + "ngrok-stable-freebsd-amd64.zip",
"freebsd_i386": CDN_V2_URL_PREFIX + "ngrok-stable-freebsd-386.zip",
"cygwin_x86_64": CDN_V2_URL_PREFIX + "ngrok-stable-windows-amd64.zip",
PLATFORMS_V3 = {
"darwin_x86_64": CDN_V3_URL_PREFIX + "ngrok-v3-stable-darwin-amd64.zip",
"darwin_x86_64_arm": CDN_V3_URL_PREFIX + "ngrok-v3-stable-darwin-arm64.zip",
"windows_x86_64": CDN_V3_URL_PREFIX + "ngrok-v3-stable-windows-amd64.zip",
"windows_i386": CDN_V3_URL_PREFIX + "ngrok-v3-stable-windows-386.zip",
"linux_x86_64_arm": CDN_V3_URL_PREFIX + "ngrok-v3-stable-linux-arm64.zip",
"linux_i386_arm": CDN_V3_URL_PREFIX + "ngrok-v3-stable-linux-arm.zip",
"linux_i386": CDN_V3_URL_PREFIX + "ngrok-v3-stable-linux-386.zip",
"linux_x86_64": CDN_V3_URL_PREFIX + "ngrok-v3-stable-linux-amd64.zip",
"freebsd_x86_64": CDN_V3_URL_PREFIX + "ngrok-v3-stable-freebsd-amd64.zip",
"freebsd_i386": CDN_V3_URL_PREFIX + "ngrok-v3-stable-freebsd-386.zip",
"cygwin_x86_64": CDN_V3_URL_PREFIX + "ngrok-v3-stable-windows-amd64.zip",
}
SUPPORTED_NGROK_VERSIONS = ["v2", "v3"]
DEFAULT_DOWNLOAD_TIMEOUT = 6
Expand Down Expand Up @@ -85,7 +85,7 @@ def install_ngrok(ngrok_path, ngrok_version="v2", **kwargs):
:type kwargs: dict, optional
"""
logger.debug(
"Installing ngrok to {}{} ...".format(ngrok_path, ", overwriting" if os.path.exists(ngrok_path) else ""))
"Installing ngrok {} to {}{} ...".format(ngrok_version, ngrok_path, ", overwriting" if os.path.exists(ngrok_path) else ""))

ngrok_dir = os.path.dirname(ngrok_path)

Expand All @@ -103,9 +103,9 @@ def install_ngrok(ngrok_path, ngrok_version="v2", **kwargs):
plat = system + "_" + arch
try:
if ngrok_version == "v2":
url = PLATFORMS_V2[plat]
elif ngrok_version == "v3":
url = PLATFORMS[plat]
elif ngrok_version == "v3":
url = PLATFORMS_V3[plat]
else:
raise PyngrokError("\"ngrok_version\" must be a supported version: {}".format(SUPPORTED_NGROK_VERSIONS))

Expand Down
3 changes: 0 additions & 3 deletions tests/test_ngrok.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,6 @@ def test_tunnel_definitions_v2(self):
}
}
}
config.update(installer.get_default_config(self.pyngrok_config_v3.ngrok_version))
config_path = os.path.join(self.config_dir, "config_v2_2.yml")
installer.install_default_config(config_path, config, ngrok_version="v2")
pyngrok_config = self.copy_with_updates(self.pyngrok_config_v2, config_path=config_path,
Expand Down Expand Up @@ -556,7 +555,6 @@ def test_tunnel_definitions_v3(self):
}
}
}
config.update(installer.get_default_config(self.pyngrok_config_v3.ngrok_version))
config_path = os.path.join(self.config_dir, "config_v3_2.yml")
installer.install_default_config(config_path, config, ngrok_version="v3")
pyngrok_config = self.copy_with_updates(self.pyngrok_config_v3, config_path=config_path,
Expand Down Expand Up @@ -595,7 +593,6 @@ def test_tunnel_definitions_pyngrok_default_with_overrides(self):
}
}
}
config.update(installer.get_default_config(self.pyngrok_config_v2.ngrok_version))
config_path = os.path.join(self.config_dir, "config_v2_2.yml")
installer.install_default_config(config_path, config, ngrok_version="v2")
subdomain = self.create_unique_subdomain()
Expand Down

0 comments on commit e5d8905

Please sign in to comment.