Skip to content

Commit

Permalink
fix: remove the MustGatherContext and InsightsOperatorContext
Browse files Browse the repository at this point in the history
These two contexts are actually used by CCX rules and redefined
in CCX Core too. They are not used in case of non-CCX scenario.
Leaving them here would cause archive context identification
error, see RHINENG-15103

Signed-off-by: Xiangce Liu <[email protected]>
  • Loading branch information
xiangce committed Jan 9, 2025
1 parent 340d7a6 commit 541975e
Showing 1 changed file with 20 additions and 22 deletions.
42 changes: 20 additions & 22 deletions insights/core/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ def __init__(self, version=DEFAULT_VERSION, release=None):
self.release = release

def __bool__(self):
return all([(self.version != DEFAULT_VERSION),
bool(self.release)])
return all([(self.version != DEFAULT_VERSION), bool(self.release)])

__nonzero__ = __bool__

Expand All @@ -102,9 +101,18 @@ def __init__(self, **kwargs):
self.loaded = True
self.cmd = None
optional_attrs = [
"content", "path", "hostname", "release",
"machine_id", "target", "last_client_run", "relative_path",
"args", "engine", "image", "container_id"
"content",
"path",
"hostname",
"release",
"machine_id",
"target",
"last_client_run",
"relative_path",
"args",
"engine",
"image",
"container_id",
]
for k in optional_attrs:
setattr(self, k, kwargs.pop(k, None))
Expand Down Expand Up @@ -168,7 +176,7 @@ def handles(cls, files):
if m in f:
i = f.find(m)
if f.endswith(m) or f[i + len(m)] == sep:
root = os.path.dirname(f[:i + 1])
root = os.path.dirname(f[: i + 1])
marker_root.add(root)
if len(marker_root) == 1:
return (marker_root.pop(), cls)
Expand All @@ -182,11 +190,13 @@ def handles(cls, files):
return (None, None)

def check_output(self, cmd, timeout=None, keep_rc=False, env=None, signum=None):
""" Subclasses can override to provide special
environment setup, command prefixes, etc.
"""
return subproc.call(cmd, timeout=timeout or self.timeout, signum=signum,
keep_rc=keep_rc, env=env)
Subclasses can override to provide special
environment setup, command prefixes, etc.
"""
return subproc.call(
cmd, timeout=timeout or self.timeout, signum=signum, keep_rc=keep_rc, env=env
)

def shell_out(self, cmd, split=True, timeout=None, keep_rc=False, env=None, signum=None):
env = env or os.environ
Expand Down Expand Up @@ -265,18 +275,6 @@ def locate_path(self, path):
return super(JDRContext, self).locate_path(p)


@fs_root
class InsightsOperatorContext(ExecutionContext):
"""Recognizes insights-operator archives"""
marker = "config/featuregate"


@fs_root
class MustGatherContext(ExecutionContext):
"""Recognizes must-gather archives"""
marker = "cluster-scoped-resources"


class OpenStackContext(ExecutionContext):
def __init__(self, hostname):
super(OpenStackContext, self).__init__()
Expand Down

0 comments on commit 541975e

Please sign in to comment.