Skip to content

Commit 6632635

Browse files
Merge pull request #2116 from ardaguclu/update-packages
NO-JIRA: Update shellescape and sspi to newer versions
2 parents a25e854 + 5bb9e8c commit 6632635

File tree

17 files changed

+306
-158
lines changed

17 files changed

+306
-158
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module github.com/openshift/oc
33
go 1.24.0
44

55
require (
6+
al.essio.dev/pkg/shellescape v1.6.0
67
github.com/AaronO/go-git-http v0.0.0-20161214145340-1d9485b3a98f
78
github.com/MakeNowJust/heredoc v1.0.0
89
github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2
9-
github.com/alessio/shellescape v1.4.1
10-
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa
10+
github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e
1111
github.com/alicebob/sqlittle v1.4.0
1212
github.com/apcera/gssapi v0.0.0-00010101000000-000000000000
1313
github.com/aws/aws-sdk-go v1.55.7

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
al.essio.dev/pkg/shellescape v1.6.0 h1:NxFcEqzFSEVCGN2yq7Huv/9hyCEGVa/TncnOOBBeXHA=
2+
al.essio.dev/pkg/shellescape v1.6.0/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
13
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
24
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
35
github.com/AaronO/go-git-http v0.0.0-20161214145340-1d9485b3a98f h1:x/RDwGRneK2/891S2o7KhZt3MhHMSCssoeDOfvolTMk=
@@ -19,10 +21,8 @@ github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2 h1:x8Brv0YNEe6
1921
github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2/go.mod h1:XyjUkMA8GN+tOOPXvnbi3XuRxWFvTJntqvTFnjmhzbk=
2022
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
2123
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
22-
github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=
23-
github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
24-
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
25-
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
24+
github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e h1:4dAU9FXIyQktpoUAgOJK3OTFc/xug0PCXYCqU0FgDKI=
25+
github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
2626
github.com/alicebob/sqlittle v1.4.0 h1:vgYt0nAjhdf/hg52MjKJ84g/uTzBPfrvI+VUBrIghxA=
2727
github.com/alicebob/sqlittle v1.4.0/go.mod h1:Co1L1qxHqCwf41puWhk2HOodojR0mcsAV4BIt8byZh8=
2828
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=

pkg/cli/admin/copytonode/copy_to_node.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"path/filepath"
1212
"strings"
1313

14-
"github.com/alessio/shellescape"
14+
"al.essio.dev/pkg/shellescape"
1515
"github.com/openshift/library-go/pkg/operator/resource/resourceread"
1616
"github.com/openshift/oc/pkg/cli/admin/pernodepod"
1717
corev1 "k8s.io/api/core/v1"

vendor/github.com/alessio/shellescape/.gitignore renamed to vendor/al.essio.dev/pkg/shellescape/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ _testmain.go
2626
.idea/
2727

2828
escargs
29+
30+
config.hcl
31+
32+
.DS_Store

vendor/github.com/alessio/shellescape/.golangci.yml renamed to vendor/al.essio.dev/pkg/shellescape/.golangci.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,27 @@ linters:
66
disable-all: true
77
enable:
88
- bodyclose
9-
- deadcode
10-
- depguard
9+
- copyloopvar
1110
- dogsled
11+
- gci
1212
- goconst
1313
- gocritic
1414
- gofmt
1515
- goimports
16-
- golint
1716
- gosec
1817
- gosimple
1918
- govet
2019
- ineffassign
21-
- interfacer
22-
- maligned
2320
- misspell
2421
- prealloc
25-
- scopelint
22+
- revive
2623
- staticcheck
27-
- structcheck
2824
- stylecheck
2925
- typecheck
26+
- thelper
3027
- unconvert
3128
- unparam
3229
- unused
33-
- misspell
3430
- wsl
3531

3632
issues:
@@ -47,18 +43,19 @@ issues:
4743
- text: "ST1003:"
4844
linters:
4945
- stylecheck
50-
# FIXME: Disabled until golangci-lint updates stylecheck with this fix:
51-
# https://github.com/dominikh/go-tools/issues/389
52-
- text: "ST1016:"
46+
- path: "_test.go"
5347
linters:
54-
- stylecheck
48+
- wsl
5549

5650
linters-settings:
5751
dogsled:
5852
max-blank-identifiers: 3
59-
maligned:
60-
# print struct with more effective memory layout or not, false by default
61-
suggest-new: true
62-
63-
run:
64-
tests: false
53+
# define the import orders
54+
gci:
55+
sections:
56+
# Standard section: captures all standard packages.
57+
- standard
58+
# Default section: catchall that is not standard or custom
59+
- default
60+
# linters that related to local tool, so they should be separated
61+
- localmodule
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# This is an example goreleaser.yaml file with some sane defaults.
2+
# Make sure to check the documentation at http://goreleaser.com
3+
before:
4+
hooks:
5+
# You may remove this if you don't use go modules.
6+
- go mod download
7+
# you may remove this if you don't need go generate
8+
- go generate ./...
9+
builds:
10+
- env:
11+
- CGO_ENABLED=0
12+
- >-
13+
{{- if eq .Os "darwin" }}
14+
{{- if eq .Arch "amd64"}}CC=o64-clang{{- end }}
15+
{{- if eq .Arch "arm64"}}CC=aarch64-apple-darwin20.2-clang{{- end }}
16+
{{- end }}
17+
{{- if eq .Os "windows" }}
18+
{{- if eq .Arch "amd64" }}CC=x86_64-w64-mingw32-gcc{{- end }}
19+
{{- end }}
20+
main: ./cmd/escargs
21+
goos:
22+
- linux
23+
- windows
24+
- darwin
25+
- freebsd
26+
goarch:
27+
- amd64
28+
- arm64
29+
- arm
30+
goarm:
31+
- 6
32+
- 7
33+
goamd64:
34+
- v2
35+
- v3
36+
ignore:
37+
- goos: darwin
38+
goarch: 386
39+
- goos: linux
40+
goarch: arm
41+
goarm: 7
42+
- goarm: mips64
43+
- gomips: hardfloat
44+
- goamd64: v4
45+
checksum:
46+
name_template: 'checksums.txt'
47+
snapshot:
48+
name_template: "{{ .Tag }}-next"
49+
changelog:
50+
sort: asc
51+
filters:
52+
exclude:
53+
- '^docs:'
54+
- '^test:'
Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
2+
# Contributor Covenant Code of Conduct
3+
4+
## Our Pledge
5+
6+
We as members, contributors, and leaders pledge to make participation in our
7+
community a harassment-free experience for everyone, regardless of age, body
8+
size, visible or invisible disability, ethnicity, sex characteristics, gender
9+
identity and expression, level of experience, education, socio-economic status,
10+
nationality, personal appearance, race, caste, color, religion, or sexual
11+
identity and orientation.
12+
13+
We pledge to act and interact in ways that contribute to an open, welcoming,
14+
diverse, inclusive, and healthy community.
15+
16+
## Our Standards
17+
18+
Examples of behavior that contributes to a positive environment for our
19+
community include:
20+
21+
* Demonstrating empathy and kindness toward other people
22+
* Being respectful of differing opinions, viewpoints, and experiences
23+
* Giving and gracefully accepting constructive feedback
24+
* Accepting responsibility and apologizing to those affected by our mistakes,
25+
and learning from the experience
26+
* Focusing on what is best not just for us as individuals, but for the overall
27+
community
28+
29+
Examples of unacceptable behavior include:
30+
31+
* The use of sexualized language or imagery, and sexual attention or advances of
32+
any kind
33+
* Trolling, insulting or derogatory comments, and personal or political attacks
34+
* Public or private harassment
35+
* Publishing others' private information, such as a physical or email address,
36+
without their explicit permission
37+
* Other conduct which could reasonably be considered inappropriate in a
38+
professional setting
39+
40+
## Enforcement Responsibilities
41+
42+
Community leaders are responsible for clarifying and enforcing our standards of
43+
acceptable behavior and will take appropriate and fair corrective action in
44+
response to any behavior that they deem inappropriate, threatening, offensive,
45+
or harmful.
46+
47+
Community leaders have the right and responsibility to remove, edit, or reject
48+
comments, commits, code, wiki edits, issues, and other contributions that are
49+
not aligned to this Code of Conduct, and will communicate reasons for moderation
50+
decisions when appropriate.
51+
52+
## Scope
53+
54+
This Code of Conduct applies within all community spaces, and also applies when
55+
an individual is officially representing the community in public spaces.
56+
Examples of representing our community include using an official email address,
57+
posting via an official social media account, or acting as an appointed
58+
representative at an online or offline event.
59+
60+
## Enforcement
61+
62+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
63+
reported to the community leaders responsible for enforcement at
64+
[alessio AT debian DOT org][contact].
65+
All complaints will be reviewed and investigated promptly and fairly.
66+
67+
All community leaders are obligated to respect the privacy and security of the
68+
reporter of any incident.
69+
70+
## Enforcement Guidelines
71+
72+
Community leaders will follow these Community Impact Guidelines in determining
73+
the consequences for any action they deem in violation of this Code of Conduct:
74+
75+
### 1. Correction
76+
77+
**Community Impact**: Use of inappropriate language or other behavior deemed
78+
unprofessional or unwelcome in the community.
79+
80+
**Consequence**: A private, written warning from community leaders, providing
81+
clarity around the nature of the violation and an explanation of why the
82+
behavior was inappropriate. A public apology may be requested.
83+
84+
### 2. Warning
85+
86+
**Community Impact**: A violation through a single incident or series of
87+
actions.
88+
89+
**Consequence**: A warning with consequences for continued behavior. No
90+
interaction with the people involved, including unsolicited interaction with
91+
those enforcing the Code of Conduct, for a specified period of time. This
92+
includes avoiding interactions in community spaces as well as external channels
93+
like social media. Violating these terms may lead to a temporary or permanent
94+
ban.
95+
96+
### 3. Temporary Ban
97+
98+
**Community Impact**: A serious violation of community standards, including
99+
sustained inappropriate behavior.
100+
101+
**Consequence**: A temporary ban from any sort of interaction or public
102+
communication with the community for a specified period of time. No public or
103+
private interaction with the people involved, including unsolicited interaction
104+
with those enforcing the Code of Conduct, is allowed during this period.
105+
Violating these terms may lead to a permanent ban.
106+
107+
### 4. Permanent Ban
108+
109+
**Community Impact**: Demonstrating a pattern of violation of community
110+
standards, including sustained inappropriate behavior, harassment of an
111+
individual, or aggression toward or disparagement of classes of individuals.
112+
113+
**Consequence**: A permanent ban from any sort of public interaction within the
114+
community.
115+
116+
## Attribution
117+
118+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
119+
version 2.1, available at
120+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
121+
122+
Community Impact Guidelines were inspired by
123+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
124+
125+
For answers to common questions about this code of conduct, see the FAQ at
126+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
127+
[https://www.contributor-covenant.org/translations][translations].
128+
129+
[homepage]: https://www.contributor-covenant.org
130+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
131+
[Mozilla CoC]: https://github.com/mozilla/diversity
132+
[FAQ]: https://www.contributor-covenant.org/faq
133+
[translations]: https://www.contributor-covenant.org/translations
134+
[contact]: mailto:alessio_AT_debian_DOT_org
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
#!/usr/bin/make -f
3+
4+
VERSION := $(shell git describe)
5+
6+
all: build
7+
8+
build:
9+
go build -a -v
10+
11+
install:
12+
go install ./cmd/escargs
13+
14+
escargs: build
15+
go build -v \
16+
-ldflags="-X 'main.version=$(VERSION)'" \
17+
./cmd/escargs
18+
19+
clean:
20+
rm -rfv escargs
21+
22+
uninstall:
23+
rm -v $(shell go env GOPATH)/bin/escargs
24+
25+
.PHONY: build clean install uninstall

0 commit comments

Comments
 (0)