update ping

Author: linzeyan

.github/workflows/codeql-analysis.yml

@@ -48,11 +48,11 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-        
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
@@ -61,7 +61,7 @@ jobs:
     # ℹ️ 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
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |

.github/workflows/release.yaml

@@ -22,19 +22,19 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.24
 
       - name: Check config
         uses: goreleaser/goreleaser-action@v3
         with:
-          version: v1.13.1
+          version: v2.8.2
           # version: latest
           args: check
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:
-          version: v1.13.1
+          version: v2.8.2
           # version: latest
           args: release --rm-dist
         env:
@@ -59,7 +59,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.24
 
       - name: Install Docker Buildx
         uses: docker/setup-buildx-action@v2

.github/workflows/test.yaml

@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         goVersion:
-          - 18
+          - 24
         os:
           - macos
           - ubuntu
@@ -57,7 +57,7 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           args: --timeout=5m
-          version: v1.48.0
+          version: v2.0.2
 
   go-test:
     needs:
@@ -66,7 +66,7 @@ jobs:
       fail-fast: false
       matrix:
         goVersion:
-          - 18
+          - 24
         os:
           - macos
           - ubuntu

.golangci.yaml

@@ -1,47 +1,27 @@
+# https://github.com/golangci/golangci-lint/blob/main/.golangci.reference.yml
+version: "2"
+
 run:
-  go: "1.18"
+  go: "1.24"
   timeout: 3m
 
-linters-settings:
-  cyclop:
-    max-complexity: 30
-    package-average: 10.0
-
-  errcheck:
-    check-type-assertions: true
-
-  funlen:
-    lines: 200
-    statements: 100
 
-  gocognit:
-    min-complexity: 50
-
-  gosec:
-    excludes:
-      - G204 # Subprocess launched with a potential tainted input or cmd arguments # Use os/exec
-      - G401 # Use of weak cryptographic primitive # md5, sha1
-      - G501 # Blocklisted import crypto/md5: weak cryptographic primitive
-      - G505 # Import blocklist: crypto/sha1
-
-  lll:
-    line-length: 200
 
 linters:
-  disable-all: true
+  disable: # temporarily
+    - errcheck
+    - goconst
+    - gosec
+    - revive
+    - govet
+    - staticcheck
   enable:
     ## enabled by default
-
-    - deadcode # Finds unused code
-    - errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases
-    - gosimple # Linter for Go source code that specializes in simplifying a code
+    # - errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases
     - govet # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
     - ineffassign # Detects when assignments to existing variables are not used
-    - staticcheck # Staticcheck is a go vet on steroids, applying a ton of static analysis checks
-    - structcheck # Finds unused struct fields
-    - typecheck # Like the front-end of a Go compiler, parses and type-checks Go code
+    # - staticcheck # Staticcheck is a go vet on steroids, applying a ton of static analysis checks
     - unused # Checks Go code for unused constants, variables, functions and types
-    - varcheck # Finds unused global variables and constants
 
     ## disabled by default
 
@@ -55,24 +35,21 @@ linters:
     - durationcheck # check for two durations multiplied together
     - errname # Checks that sentinel errors are prefixed with the Err and error types are suffixed with the Error.
     - errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13.
-    - execinquery # execinquery is a linter about query string checker in Query function which reads your Go src files and warning it finds
     - exhaustive # check exhaustiveness of enum switch statements
-    - exportloopref # checks for pointers to enclosing loop variables
     # - forbidigo # Forbids identifiers
     - funlen # Tool for detection of long functions
     # - gochecknoglobals # check that no global variables exist
     # - gochecknoinits # Checks that no init functions are present in Go code
     - gocognit # Computes and checks the cognitive complexity of functions
-    - goconst # Finds repeated strings that could be replaced by a constant
+    # - goconst # Finds repeated strings that could be replaced by a constant
     - gocritic # Provides diagnostics that check for bugs, performance and style issues.
     - gocyclo # Computes and checks the cyclomatic complexity of functions
     - godot # Check if comments end in a period
-    - goimports # In addition to fixing imports, goimports also formats your code in the same style as gofmt.
     # - gomnd # An analyzer to detect magic numbers.
     - gomoddirectives # Manage the use of 'replace', 'retract', and 'excludes' directives in go.mod.
     - gomodguard # Allow and block list linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations.
     - goprintffuncname # Checks that printf-like functions are named with f at the end
-    - gosec # Inspects source code for security problems
+    # - gosec # Inspects source code for security problems
     - lll # Reports long lines
     - makezero # Finds slice declarations with non-zero initial length
     - nakedret # Finds naked returns in functions greater than a specified function length
@@ -85,11 +62,9 @@ linters:
     - nosprintfhostport # Checks for misuse of Sprintf to construct a host with port in a URL.
     - predeclared # find code that shadows one of Go's predeclared identifiers
     - promlinter # Check Prometheus metrics naming via promlint
-    - revive # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint.
+    # - revive # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint.
     - rowserrcheck # checks whether Err of rows is checked successfully
     - sqlclosecheck # Checks that sql.Rows and sql.Stmt are closed.
-    - stylecheck # Stylecheck is a replacement for golint
-    - tenv # tenv is analyzer that detects using os.Setenv instead of t.Setenv since Go1.17
     - testpackage # linter that makes you use a separate _test package
     - tparallel # tparallel detects inappropriate usage of t.Parallel() method in your Go test codes
     - unconvert # Remove unnecessary type conversions
@@ -134,6 +109,30 @@ linters:
   #- interfacer # [deprecated] Linter that suggests narrower interface types
   #- maligned # [deprecated, replaced by govet fieldalignment] Tool to detect Go structs that would take less memory if their fields were sorted
   #- scopelint # [deprecated, replaced by exportloopref] Scopelint checks for unpinned variables in go programs
+  settings:
+    cyclop:
+      max-complexity: 30
+      package-average: 10.0
+
+    errcheck:
+      check-type-assertions: true
+
+    funlen:
+      lines: 200
+      statements: 100
+
+    gocognit:
+      min-complexity: 50
+
+    gosec:
+      excludes:
+        - G204 # Subprocess launched with a potential tainted input or cmd arguments # Use os/exec
+        - G401 # Use of weak cryptographic primitive # md5, sha1
+        - G501 # Blocklisted import crypto/md5: weak cryptographic primitive
+        - G505 # Import blocklist: crypto/sha1
+
+    lll:
+      line-length: 200
 
 issues:
   max-same-issues: 10

.goreleaser.yaml

@@ -1,5 +1,8 @@
 # This is an example .goreleaser.yml file with some sensible defaults.
 # Make sure to check the documentation at https://goreleaser.com
+# https://github.com/goreleaser/goreleaser/blob/main/.goreleaser.yaml
+
+version: 2
 env:
   - GO111MODULE=on
   - CGO_ENABLED=0
@@ -42,12 +45,11 @@ archives:
     wrap_in_directory: true
 
 changelog:
-  skip: true
-  # sort: asc
-  # filters:
-  #   exclude:
-  #     - "^docs:"
-  #     - "^test:"
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
 
 nfpms:
   - id: packages
@@ -90,6 +92,7 @@ nfpms:
 brews:
   - name: "{{ .ProjectName }}"
     homepage: https://github.com/linzeyan/homebrew-tools
-    tap:
+    license: Apache-2.0
+  - repository:
       owner: linzeyan
       name: homebrew-tools

cmd/ping.go

@@ -22,8 +22,11 @@ import (
 	"fmt"
 	"math"
 	"net"
+	"net/netip"
 	"os"
 	"os/signal"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/linzeyan/ops-cli/cmd/common"
@@ -232,9 +235,17 @@ func (p *Ping) Connect(c context.Context, host string) {
 	if p.IPv6 {
 		network = "ip6"
 	}
+	if network == "ip4" {
+		addr, err := ParseAnyIPv4Netip(host)
+		if err != nil {
+			logger.Error(err.Error())
+			return
+		}
+		host = addr.String()
+	}
 	addr, err := net.ResolveIPAddr(network, host)
 	if err != nil {
-		logger.Debug(err.Error())
+		logger.Error(err.Error())
 		return
 	}
 	if p.IPv6 {
@@ -334,3 +345,82 @@ func (p *Ping) summary(host string, t time.Duration) {
 		p.stat.Min, avg, p.stat.Max, time.Duration(math.Sqrt(variance)))
 	printer.Printf(out)
 }
+
+func ParseAnyIPv4Netip(input string) (netip.Addr, error) {
+	parts := strings.Split(input, ".")
+	switch len(parts) {
+	case 1:
+		val, err := strconv.ParseUint(parts[0], 10, 32)
+		if err != nil {
+			return netip.Addr{}, err
+		}
+		ip := netip.AddrFrom4([4]byte{
+			byte(val >> 24),
+			byte(val >> 16),
+			byte(val >> 8),
+			byte(val),
+		})
+
+		return ip, nil
+	case 2:
+		a, err := strconv.Atoi(parts[0])
+		if err != nil {
+			return netip.Addr{}, err
+		}
+		b, err := strconv.Atoi(parts[1])
+		if err != nil {
+			return netip.Addr{}, err
+		}
+		ip := netip.AddrFrom4([4]byte{
+			byte(a),
+			byte(b >> 16),
+			byte((b >> 8) & 0xFF),
+			byte(b & 0xFF),
+		})
+		return ip, nil
+	case 3:
+		a, err := strconv.Atoi(parts[0])
+		if err != nil {
+			return netip.Addr{}, err
+		}
+		b, err := strconv.Atoi(parts[1])
+		if err != nil {
+			return netip.Addr{}, err
+		}
+		c, err := strconv.Atoi(parts[2])
+		if err != nil {
+			return netip.Addr{}, err
+		}
+		ip := netip.AddrFrom4([4]byte{
+			byte(a),
+			byte(b),
+			byte(c >> 8),
+			byte(c & 0xFF),
+		})
+		return ip, nil
+	case 4:
+		ip, err := netip.ParseAddr(input)
+		if err != nil || !ip.Is4() {
+			return netip.Addr{}, errors.New("invalid IPv4 address")
+		}
+		return ip, nil
+	default:
+		return netip.Addr{}, errors.New("invalid format")
+	}
+}
+
+func IPv4NetipToAllForms(ip netip.Addr) (string, string, string, string) {
+	if !ip.Is4() {
+		panic("not an IPv4 address")
+	}
+	b := ip.As4()
+
+	f3 := uint32(b[2])<<8 | uint32(b[3])
+	f2 := uint32(b[1])<<16 | f3
+	f1 := uint32(b[0])<<24 | f2
+	form2 := fmt.Sprintf("%d.%d", b[0], f2)
+	form3 := fmt.Sprintf("%d.%d.%d", b[0], b[1], f3)
+	form4 := ip.String()
+
+	return strconv.FormatUint(uint64(f1), 10), form2, form3, form4
+}

cmd/tree.go

@@ -141,19 +141,19 @@ func initTree() *cobra.Command {
 				inf.Print(opts)
 				if !flags.noReport {
 					footer := "\n%d "
-					switch {
+					switch nd {
 					default:
 						footer += "directories"
-					case nd == 1:
+					case 1:
 						footer += "directory"
 					}
 
 					footer = fmt.Sprintf(footer, nd)
 					if !flags.dirs {
-						switch {
+						switch nf {
 						default:
 							footer += ", %d files\n"
-						case nf == 1:
+						case 1:
 							footer += ", %d file\n"
 						}
 						footer = fmt.Sprintf(footer, nf)