Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revendor flux to update ResourceID parsing #2573

Merged
merged 2 commits into from
Mar 25, 2019
Merged

Revendor flux to update ResourceID parsing #2573

merged 2 commits into from
Mar 25, 2019

Conversation

squaremo
Copy link
Contributor

@squaremo squaremo commented Mar 21, 2019 •
edited
Loading

flux changed its definition of "ResourceID" to admit a sentinel value in the place of the namespace. These get sent in events to Weave Cloud, which won't be able to parse them, meaning those events get rejected.

See fluxcd/flux#1851 for the original problem.

@squaremo
Copy link
Contributor Author

What on earth is this failure about?

mockgen -destination=users/mock_users/mock_usersclient.go github.com/weaveworks/service/users UsersClient \
	&& sed -i'' s,github.com/weaveworks/service/vendor/,, users/mock_users/mock_usersclient.go
mockgen -destination=billing-api/db/mock_db/mock_db.go github.com/weaveworks/service/billing-api/db DB
mockgen -source=common/billing/grpc/billing.pb.go -destination=common/billing/grpc/mock_grpc.go -package=grpc
/tmp/gopackages408460729/runtime_cgo/cgo.cgo1.go:1: no such file or directory
/tmp/gopackages408460729/net/cgo_linux.cgo1.go:1: no such file or directory
/tmp/gopackages408460729/net/cgo_resnew.cgo1.go:1: no such file or directory
/tmp/gopackages408460729/net/cgo_socknew.cgo1.go:1: no such file or directory
/tmp/gopackages408460729/net/cgo_unix.cgo1.go:1: no such file or directory
2019/03/21 17:43:04 Loading input failed: loading package failed
Makefile:292: recipe for target 'common/billing/grpc/mock_grpc.go' failed
make: *** [common/billing/grpc/mock_grpc.go] Error 1
make: Leaving directory '/go/src/github.com/weaveworks/service'
make: *** [test] Error 2
Exited with code 2

@squaremo
Copy link
Contributor Author

What on earth is this failure about?

Apparently it is a common affliction: https://circleci.com/gh/weaveworks/service/13897

@awh
Copy link

awh commented Mar 22, 2019

I'm going to rebase this on the mockgen fix...

@awh awh force-pushed the bump/revendor-flux-resourceid-parsing branch from bf0658e to 0b5e3a6 Compare March 22, 2019 11:08
awh and others added 2 commits March 25, 2019 14:04
@awh
Revert gogo/protobuf upgrade
5fd130d 
When we updated to use go 1.10.x, we also updated the version of
gogo/protobuf in an attempt to work around a dependency issue. This in
turn caused the generated users.pb.go to change, which is probably
undesirable if we can avoid it. Solve the problem in a different way.
@squaremo @awh
Revendor flux to update ResourceID parsing
e51dbfb
@awh awh force-pushed the bump/revendor-flux-resourceid-parsing branch from 0b5e3a6 to e51dbfb Compare March 25, 2019 14:27
@awh
Copy link

awh commented Mar 25, 2019

Should wait until #2580 goes in before merging.

@awh awh merged commit 726a3a9 into master Mar 25, 2019
@awh awh deleted the bump/revendor-flux-resourceid-parsing branch March 25, 2019 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awh awh awh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@squaremo @awh