add --no-warn flag, consolidate decorators

Author: kieranmanning

cloudsmith_cli/cli/commands/repos.py

@@ -75,7 +75,6 @@ def repositories(ctx, opts):  # pylink: disable=unused-argument
 @decorators.common_cli_output_options
 @decorators.common_api_auth_options
 @decorators.initialise_api
-@decorators.verify_authenticated
 @click.argument(
     "owner_repo",
     metavar="OWNER/REPO",

cloudsmith_cli/cli/config.py

@@ -162,7 +162,7 @@ def config_already_warned(cls):
         return False
 
     @classmethod
-    def load_config(cls, opts, path=None, profile=None):
+    def load_config(cls, opts, path=None, profile=None, no_warn=False):
         """Load a configuration file into an options object."""
         if path and os.path.exists(path):
             if os.path.isdir(path):
@@ -174,12 +174,14 @@ def load_config(cls, opts, path=None, profile=None):
         values = config.get("default", {})
         cls._load_values_into_opts(opts, values)
 
+        warn = not no_warn and not cls.config_already_warned()
+
         if profile and profile != "default":
             try:
                 values = config["profile:%s" % profile]
                 cls._load_values_into_opts(opts, values)
             except KeyError:
-                if not cls.config_already_warned():
+                if warn:
                     click.secho(
                         f"Warning: profile {profile} not found in config files {cls.config_files}",
                         fg="yellow",
@@ -188,7 +190,7 @@ def load_config(cls, opts, path=None, profile=None):
         existing_config_paths = {
             path: os.path.exists(path) for path in cls.config_files
         }
-        if not any(existing_config_paths.values()) and not cls.config_already_warned():
+        if not any(existing_config_paths.values()) and warn:
             click.secho(
                 "Warning: No config files found in search paths. Tried the following:",
                 fg="yellow",
@@ -246,7 +248,7 @@ class CredentialsReader(ConfigReader):
     config_section_schemas = [CredentialsSchema.Default, CredentialsSchema.Profile]
 
     @classmethod
-    def load_config(cls, opts, path=None, profile=None):
+    def load_config(cls, opts, path=None, profile=None, no_warn=False):
         """
         Load a credentials configuration file into an options object.
         We overload the load_config command in CredentialsReader as
@@ -269,6 +271,7 @@ def load_config(cls, opts, path=None, profile=None):
         return values
 
 
+# pylint: disable=too-many-public-methods
 class Options:
     """Options object that holds config for the application."""
 
@@ -289,15 +292,15 @@ def get_creds_reader():
         """Get the credentials config reader class."""
         return CredentialsReader
 
-    def load_config_file(self, path, profile=None):
+    def load_config_file(self, path, profile=None, no_warn=False):
         """Load the standard config file."""
         config_cls = self.get_config_reader()
-        return config_cls.load_config(self, path, profile=profile)
+        return config_cls.load_config(self, path, profile=profile, no_warn=no_warn)
 
-    def load_creds_file(self, path, profile=None):
+    def load_creds_file(self, path, profile=None, no_warn=False):
         """Load the credentials config file."""
         config_cls = self.get_creds_reader()
-        return config_cls.load_config(self, path, profile=profile)
+        return config_cls.load_config(self, path, profile=profile, no_warn=no_warn)
 
     @property
     def api_config(self):
@@ -330,6 +333,16 @@ def api_host(self, value):
         """Set value for API host."""
         self._set_option("api_host", value)
 
+    @property
+    def no_warn(self):
+        """Get value for API host."""
+        return self._get_option("no_warn")
+
+    @no_warn.setter
+    def no_warn(self, value):
+        """Set value for API host."""
+        self._set_option("no_warn", value)
+
     @property
     def api_key(self):
         """Get value for API key."""

cloudsmith_cli/cli/decorators.py

@@ -87,6 +87,12 @@ def common_cli_config_options(f):
         envvar="CLOUDSMITH_PROFILE",
         help="The name of the profile to use for configuration.",
     )
+    @click.option(
+        "--no-warn",
+        is_flag=True,
+        default=None,
+        help="Don't warn on misconfiguration issues",
+    )
     @click.pass_context
     @functools.wraps(f)
     def wrapper(ctx, *args, **kwargs):
@@ -95,8 +101,11 @@ def wrapper(ctx, *args, **kwargs):
         profile = kwargs.pop("profile")
         config_file = kwargs.pop("config_file")
         creds_file = kwargs.pop("credentials_file")
-        opts.load_config_file(path=config_file, profile=profile)
-        opts.load_creds_file(path=creds_file, profile=profile)
+        no_warn = kwargs.pop("no_warn")
+        if no_warn:
+            opts.no_warn = no_warn
+        opts.load_config_file(path=config_file, profile=profile, no_warn=no_warn)
+        opts.load_creds_file(path=creds_file, profile=profile, no_warn=no_warn)
         kwargs["opts"] = opts
         return ctx.invoke(f, *args, **kwargs)
 
@@ -306,27 +315,8 @@ def call_print_rate_limit_info_with_opts(rate_info):
             error_retry_cb=opts.error_retry_cb,
         )
 
-        kwargs["opts"] = opts
-        return ctx.invoke(f, *args, **kwargs)
-
-    return wrapper
-
-
-def verify_authenticated(f):
-    """Verify that the user is authenticated and warn if not."""
-
-    @click.option(
-        "--no-warn",
-        default=False,
-        is_flag=True,
-        help="Don't warn on misconfiguration issues",
-    )
-    @click.pass_context
-    @functools.wraps(f)
-    def wrapper(ctx, *args, **kwargs):
         cloudsmith_host = kwargs["opts"].opts["api_config"].host
-        print(kwargs["opts"].opts["api_config"].__dict__)
-        no_warn = kwargs.pop("no_warn")
+        no_warn = opts.no_warn
         is_auth, _, _, _ = get_user_brief()
         if not is_auth and not no_warn:
             click.secho(
@@ -339,10 +329,8 @@ def wrapper(ctx, *args, **kwargs):
                 f"You're currently attempting to connect to Cloudsmith instance {cloudsmith_host}",
                 fg="yellow",
             )
-            no_warn = True
+            opts.no_warn = True
 
-        opts = config.get_or_create_options(ctx)
-        opts.no_warn = no_warn
         kwargs["opts"] = opts
         return ctx.invoke(f, *args, **kwargs)