kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9740 from hakman/fix-goimports 

Fix update and verify goimports
This commit is contained in:
Kubernetes Prow Robot 2020-08-12 07:05:45 -07:00 committed by GitHub
parent c10d6c4710 ecc30f7b47
commit 04416c38f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/update-goimports
View File

@ -36,4 +36,4 @@ for package in packages:
print("packages %s" % paths)
subprocess.call(['go', 'run', 'golang.org/x/tools/cmd/goimports', '-w'] + paths, cwd=path.join(gopath, 'src'))
subprocess.call(['go', 'run', 'k8s.io/kops/vendor/golang.org/x/tools/cmd/goimports', '-w'] + paths, cwd=path.join(gopath, 'src'))

14
hack/verify-goimports
View File

@ -47,13 +47,19 @@ if process.returncode != 0:
print("packages %s" % paths)
env = os.environ
env["GO111MODULE"] = "on"
process = subprocess.Popen(['go', 'run', 'golang.org/x/tools/cmd/goimports', '-l'] + paths, stdout=subprocess.PIPE, cwd=path.join(gopath, 'src'), env=env)
process = subprocess.Popen(
['go', 'run', 'k8s.io/kops/vendor/golang.org/x/tools/cmd/goimports', '-l'] + paths,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
cwd=path.join(gopath, 'src'),
env=env
)
stdout, stderr = process.communicate()
if stdout.strip().decode('ascii') != "":
if stdout.strip().decode('ascii') != "" or stderr.strip().decode('ascii') != "":
print("FAIL: 'goimports -w' needs to be run on the following files: ")
print(stdout.decode('ascii'))
print("STDOUT:\n" + stdout.decode('ascii'))
print("STDERR:\n" + stderr.decode('ascii'))
print('FAIL: Please run the following command: make goimports')
sys.exit(1)