Skip to content

Commit

Permalink
Merge branch 'master' into patch-7
Browse files Browse the repository at this point in the history
  • Loading branch information
robertcheramy authored Jan 15, 2024
2 parents 59b5ac7 + 2654330 commit 4bf8d7e
Show file tree
Hide file tree
Showing 59 changed files with 549 additions and 543 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -58,7 +58,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -71,6 +71,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
operations-per-run: 500
days-before-issue-stale: 90
Expand Down
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ AllCops:
Exclude:
- 'vendor/**/*'

Gemspec/DevelopmentDependencies:
EnforcedStyle: gemspec

Style/StringLiterals:
Enabled: false

Expand Down
95 changes: 6 additions & 89 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2023-04-14 17:17:03 UTC using RuboCop version 1.48.1.
# on 2023-11-27 13:35:47 UTC using RuboCop version 1.57.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

# Offense count: 3
# Configuration parameters: AllowComments, AllowNil.
Lint/SuppressedException:
Exclude:
- 'lib/oxidized/input/ssh.rb'
- 'lib/oxidized/input/telnet.rb'
- 'lib/oxidized/nodes.rb'

# Offense count: 62
# Offense count: 64
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
Metrics/AbcSize:
Max: 92
Expand All @@ -30,42 +22,18 @@ Metrics/PerceivedComplexity:
Max: 12

# Offense count: 1
Naming/AccessorMethodName:
Exclude:
- 'lib/refinements.rb'

# Offense count: 8
Naming/ConstantName:
Exclude:
- 'extra/rest_client.rb'
- 'lib/oxidized/config.rb'
- 'lib/oxidized/hook.rb'
- 'lib/oxidized/input/ftp.rb'
- 'lib/oxidized/input/input.rb'
- 'lib/oxidized/input/ssh.rb'
- 'lib/oxidized/input/telnet.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyleForLeadingUnderscores.
# SupportedStylesForLeadingUnderscores: disallowed, required, optional
Naming/MemoizedInstanceVariableName:
Exclude:
- 'lib/refinements.rb'

# Offense count: 9
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: PreferredName.
Naming/RescuedExceptionsVariableName:
Exclude:
- 'bin/oxidized'
- 'extra/rest_client.rb'
- 'extra/syslog.rb'
- 'lib/oxidized/cli.rb'
- 'lib/oxidized/config.rb'
- 'lib/oxidized/node.rb'
- 'lib/oxidized/nodes.rb'
- 'lib/oxidized/source/sql.rb'

# Offense count: 2
Rake/DuplicateTask:
Exclude:
Expand All @@ -76,14 +44,13 @@ Security/Eval:
Exclude:
- 'Rakefile'

# Offense count: 3
# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: nested, compact
Style/ClassAndModuleChildren:
Exclude:
- 'lib/oxidized/config/vars.rb'
- 'lib/oxidized/nodes.rb'

# Offense count: 2
Style/ClassVars:
Expand All @@ -98,58 +65,14 @@ Style/DoubleNegation:
Exclude:
- 'lib/oxidized/hook/exec.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
Style/GlobalStdStream:
Exclude:
- 'lib/oxidized.rb'

# Offense count: 3
Style/OpenStructUse:
Exclude:
- 'lib/oxidized/hook.rb'
- 'lib/oxidized/node.rb'
- 'spec/hook/githubrepo_spec.rb'

# Offense count: 27
# This cop supports safe autocorrection (--autocorrect).
Style/RedundantRegexpCharacterClass:
Exclude:
- 'lib/oxidized/model/axos.rb'
- 'lib/oxidized/model/comtrol.rb'
- 'lib/oxidized/model/fabricos.rb'
- 'lib/oxidized/model/ironware.rb'
- 'lib/oxidized/model/mlnxos.rb'
- 'lib/oxidized/model/nxos.rb'
- 'lib/oxidized/model/slxos.rb'
- 'lib/oxidized/model/sonicos.rb'
- 'lib/oxidized/model/speedtouch.rb'
- 'lib/oxidized/model/telco.rb'
- 'lib/oxidized/model/ucs.rb'
- 'lib/oxidized/model/voltaire.rb'
- 'lib/oxidized/model/zhoneolt.rb'
- 'lib/oxidized/model/zynoscli.rb'

# Offense count: 37
# This cop supports safe autocorrection (--autocorrect).
Style/RedundantRegexpEscape:
Exclude:
- 'lib/oxidized/model/adva.rb'
- 'lib/oxidized/model/airfiber.rb'
- 'lib/oxidized/model/aosw.rb'
- 'lib/oxidized/model/c4cmts.rb'
- 'lib/oxidized/model/dellx.rb'
- 'lib/oxidized/model/eltex.rb'
- 'lib/oxidized/model/enterasys800.rb'
- 'lib/oxidized/model/netonix.rb'
- 'lib/oxidized/model/netscaler.rb'
- 'lib/oxidized/model/openbsd.rb'
- 'lib/oxidized/model/siklu.rb'
- 'lib/oxidized/model/slxos.rb'
- 'lib/oxidized/model/sonicos.rb'
- 'lib/oxidized/model/trango.rb'

# Offense count: 45
# Offense count: 47
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
# SupportedStyles: slashes, percent_r, mixed
Expand All @@ -161,14 +84,8 @@ Style/RegexpLiteral:
Style/SlicingWithRange:
Enabled: false

# Offense count: 81
# Offense count: 82
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: Mode.
Style/StringConcatenation:
Enabled: false

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
Style/ZeroLengthPredicate:
Exclude:
- 'lib/oxidized/core.rb'
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
- model for Mimosa B11 (@ritzbhuj)
- added SCP input (@aeiodelic)
- Added `linux/arm64` and `linux/amd64` platforms to Docker build/publish. (@disaac)
- Added verion info for Vyatta (@systeembeheerder)

## Changed
- tp-link: fixed enable mode post login entrance (@mirackle-spb)
Expand All @@ -26,7 +27,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
- iosxr: include last config changed by in model (@electrocret)
- panos: exclude device dictionary
- Added support for Nokia SAR 7705 HMC in SROS model (@schouwenburg)
- edgecos: improve system temperature removal
- fortios: only perform a "show" instead of a "show full-configuration" when retrieving configs from fortios. fixes timeouts and avoids extraneous defaulted config information. (@jforeman)
- opengear: support newer Opengear CM* and OM* models (@matej_v)
- edgecos: improve system temperature removal (@freddy36)

## Fixed
- fixed empty lines for ZyXEL GS1900 switches (@jluebbe)
Expand All @@ -43,6 +46,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
- fixed source http when source is librenms (@davama)
- fixed prompt detection for Netgear M4250-10G2XF-PoE+ and M4300-28G-PoE+ (@rexhaugen)
- fixed devices (pfsense, opnsense, openwrt) not retriving config after refinement change #2771 #2968 (@robertcheramy)
- Fixed login into Fortigate when post-login-baned ist enabled. Fixes #2021 (@chrisr0880, @sahdan, @dangoscomb and @robertcheramy)
- Fixed pre_logout for BDCOM switches

## [0.29.1 - 2023-04-24]

Expand Down
Loading

0 comments on commit 4bf8d7e

Please sign in to comment.