Skip to content

Commit

Permalink
chore: updates after repo moved orgs (#435)
Browse files Browse the repository at this point in the history
Changes after the repo was moved from the `Weaveworks` GitHub org to the
`Weaveworks-liquidmetal` GitHub org. Most of the changes are Go module
imports/definitions. There where a small numbre of lint issues after
moving and these have been fixed as well.

Signed-off-by: Richard Case <[email protected]>
  • Loading branch information
richardcase authored May 10, 2022
1 parent 4f504e5 commit 3c115ce
Show file tree
Hide file tree
Showing 125 changed files with 542 additions and 580 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Before creating a new request for help, please search existing issues to see if
If there is a similar feature request please up-vote it and/or add your comments to it instead
For more information on how to request help on flintlock, please refer to our community docs.
https://github.com/weaveworks/flintlock/blob/main/CONTRIBUTING.md#opening-issues
https://github.com/weaveworks-liquidmetal/flintlock/blob/main/CONTRIBUTING.md#opening-issues
-->

**What happened:**
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Before creating a new feature request, please search existing issues to see if y
If there is a similar feature request please up-vote it and/or add your comments to it instead
For more information on how to request help on flintlock, please refer to our community docs.
https://github.com/weaveworks/flintlock/blob/main/CONTRIBUTING.md#opening-issues
https://github.com/weaveworks-liquidmetal/flintlock/blob/main/CONTRIBUTING.md#opening-issues
-->

**Describe the solution you'd like:**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fork.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
To complete work on this Issue:
- [ ] Update (merge or rebase) the [fork macvtap feature branch](https://github.com/weaveworks/firecracker/tree/feature/macvtap) to the latest upstream release tag ${{ env.NEW_VERSION }}. **Note: Do not update the feature branch to upstream main.**
- [ ] Make sure it builds. (See: [doc](https://github.com/weaveworks/flintlock/blob/main/docs/quick-start.md#set-up-firecracker))
- [ ] Make sure it builds. (See: [doc](https://github.com/weaveworks-liquidmetal/flintlock/blob/main/docs/quick-start.md#set-up-firecracker))
- [ ] Push the updated firecracker 'feature/macvtap' fork branch.
- [ ] Create a new tag on the updated firecracker 'feature/macvtap' fork branch: `git tag -s ${{ env.NEW_VERSION}}-macvtap -m ${{ env.NEW_VERSION }}-macvtap`.
- [ ] Push the tag to the fork: `git push <remote> ${{ env.NEW_VERSION }}-macvtap` (A new [release](https://github.com/weaveworks/firecracker/releases) will be created.)
Expand All @@ -57,7 +57,7 @@ jobs:
uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a
with:
slack_token: ${{ secrets.SLACK_TOKEN }}
message: "There is a new version of Firecracker, complete the todo list here: <https://github.com/weaveworks/flintlock/issues/${{ steps.issue.outputs.issue-number }}|#${{ steps.issue.outputs.issue-number }}>."
message: "There is a new version of Firecracker, complete the todo list here: <https://github.com/weaveworks-liquidmetal/flintlock/issues/${{ steps.issue.outputs.issue-number }}|#${{ steps.issue.outputs.issue-number }}>."
channel: team-quick-silver
color: green
verbose: false
Expand Down
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,4 @@ linters:
- nilnil
- scopelint
- tagliatelle
- gomoddirectives
30 changes: 15 additions & 15 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ Here is a non-exhaustive list of ways you can help out:

1. Help out others in the [community slack channel][slack-channel], or in some [discussions][discussions]. :sos:

1. Chime in on [bugs](https://github.com/weaveworks/flintlock/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug+), [feature requests](https://github.com/weaveworks/flintlock/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Ffeature) and asks for [help][discussions]. :thought_balloon:
1. Chime in on [bugs](https://github.com/weaveworks-liquidmetal/flintlock/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug+), [feature requests](https://github.com/weaveworks-liquidmetal/flintlock/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Ffeature) and asks for [help][discussions]. :thought_balloon:

1. Dig into some [`needs-investigation`](https://github.com/weaveworks/flintlock/labels/needs-investigation) or [`help wanted`](https://github.com/weaveworks/flintlock/labels/help-wanted) :detective:
1. Dig into some [`needs-investigation`](https://github.com/weaveworks-liquidmetal/flintlock/labels/needs-investigation) or [`help wanted`](https://github.com/weaveworks-liquidmetal/flintlock/labels/help-wanted) :detective:

1. Get involved in some [PR reviews](https://github.com/weaveworks/flintlock/pulls). :nerd_face:
1. Get involved in some [PR reviews](https://github.com/weaveworks-liquidmetal/flintlock/pulls). :nerd_face:

# Opening Issues

Expand Down Expand Up @@ -219,7 +219,7 @@ If you are not here to report a bug, ask for help or request some new behaviour,
is the section for you. We have curated a set of issues for anyone who simply
wants to build up their open-source cred :muscle:.

- Issues labelled [`good first issue`](https://github.com/weaveworks/flintlock/labels/good%20first%20issue)
- Issues labelled [`good first issue`](https://github.com/weaveworks-liquidmetal/flintlock/labels/good%20first%20issue)
should be accessible to folks new to the repo, as well as to open source in general.

These issues should present a low/non-existent barrier to entry with a thorough description,
Expand All @@ -235,7 +235,7 @@ wants to build up their open-source cred :muscle:.

See more on [asking for help](#asking-for-help) below!

- [`help wanted` issues](https://github.com/weaveworks/flintlock/labels/help%20wanted)
- [`help wanted` issues](https://github.com/weaveworks-liquidmetal/flintlock/labels/help%20wanted)
are for those a little more familiar with the code base, but should still be accessible enough
to newcomers.

Expand Down Expand Up @@ -281,7 +281,7 @@ highlights some tools you can use to interact with the service.

This project is written in Go. To be able to contribute you will need:

1. A working Go installation of Go 1.17. You can check the
1. A working Go installation of go 1.17. You can check the
[official installation guide](https://golang.org/doc/install).

2. Make sure that `$(go env GOPATH)/bin` is in your shell's `PATH`. You can do so by
Expand Down Expand Up @@ -358,7 +358,7 @@ and the E2E tests you can get to work :tada: .

1. Make sure your commits are [signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).

1. **All code contributions must be submitted with unit tests**. See [this package](https://github.com/weaveworks/flintlock/tree/main/core/steps/microvm)
1. **All code contributions must be submitted with unit tests**. See [this package](https://github.com/weaveworks-liquidmetal/flintlock/tree/main/core/steps/microvm)
package for a good example of tests.

1. For extra special bonus points, if you see any tests missing from the area you are
Expand Down Expand Up @@ -470,7 +470,7 @@ the body of the commit should describe the _why_ and _how_.
If you encountered any weirdness along the way, this is a good place
to note what you discovered and how you solved it.

An example of a stellar commit message can be found [here](https://github.com/weaveworks/flintlock/commit/7a30dd99dc7c05827ba11050505c476799bb2932).
An example of a stellar commit message can be found [here](https://github.com/weaveworks-liquidmetal/flintlock/commit/7a30dd99dc7c05827ba11050505c476799bb2932).

The format can be described more formally as follows:

Expand All @@ -497,7 +497,7 @@ The core team regularly processes incoming issues. There may be some delay over

Every issue will be assigned a `priority/<x>` label. The levels of priorities are:

- [`critical-urgent`](https://github.com/weaveworks/flintlock/labels/priority%2Fcritical-urgent): These are time sensitive issues which should be picked up immediately.
- [`critical-urgent`](https://github.com/weaveworks-liquidmetal/flintlock/labels/priority%2Fcritical-urgent): These are time sensitive issues which should be picked up immediately.
If an issue labelled `critical` is not assigned or being actively worked on,
someone is expected to drop what they're doing immediately to work on it.
This usually means the core team, but community members are welcome to claim
Expand All @@ -506,13 +506,13 @@ Every issue will be assigned a `priority/<x>` label. The levels of priorities ar
they will be paired with a core team-member to manage the tracking, communication and release of any fix
as well as to assume responsibility of all progess._

- [`important-soon`](https://github.com/weaveworks/flintlock/labels/priority%2Fimportant-soon): Must be assigned as soon as capacity becomes available.
- [`important-soon`](https://github.com/weaveworks-liquidmetal/flintlock/labels/priority%2Fimportant-soon): Must be assigned as soon as capacity becomes available.
Ideally something should be delivered in time for the next release.

- [`important-longterm`](https://github.com/weaveworks/flintlock/labels/priority%2Fimportant-longterm): Important over the long term, but may not be currently
- [`important-longterm`](https://github.com/weaveworks-liquidmetal/flintlock/labels/priority%2Fimportant-longterm): Important over the long term, but may not be currently
staffed and/or may require multiple releases to complete.

- [`backlog`](https://github.com/weaveworks/flintlock/labels/priority%2Fbacklog): There appears to be general agreement that this would be good to have,
- [`backlog`](https://github.com/weaveworks-liquidmetal/flintlock/labels/priority%2Fbacklog): There appears to be general agreement that this would be good to have,
but we may not have anyone available to work on it right now or in the immediate future.
PRs are still very welcome, although it might take a while to get them reviewed if
reviewers are fully occupied with higher priority issues, for example immediately before a release.
Expand All @@ -521,11 +521,11 @@ These priority categories have been inspired by [the Kubernetes contributing gui

Other labels include:

- [`adr-required`](https://github.com/weaveworks/flintlock/labels/adr-required):
- [`adr-required`](https://github.com/weaveworks-liquidmetal/flintlock/labels/adr-required):
Indicates that the issue or PR contains a decision that needs to be documented in a [ADR](#adrs-architectural-decision-records) _before_
it can be worked on.

- [`needs-investigation`](https://github.com/weaveworks/flintlock/labels/needs-investigation): There is currently insufficient information to either categorize properly,
- [`needs-investigation`](https://github.com/weaveworks-liquidmetal/flintlock/labels/needs-investigation): There is currently insufficient information to either categorize properly,
or to understand and implement a solution. This could be because the issue opener did
not provide enough relevant information, or because more in-depth research is required
before work can begin.
Expand Down Expand Up @@ -579,5 +579,5 @@ Contributors are also welcome to backfill ADRs if they are found to be missing.
[user-docs]: https://docs.flintlock.dev/
[slack-channel]: https://weave-community.slack.com/archives/C02KARWGR7S
[quick-start]: ./docs/quick-start.md
[discussions]: https://github.com/weaveworks/flintlock/discussions
[discussions]: https://github.com/weaveworks-liquidmetal/flintlock/discussions
[adr-template]: ./docs/adr/0000-template.md
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BUILD_DATE := $(shell date +%Y-%m-%dT%H:%M:%SZ)
GIT_COMMIT := $(shell git rev-parse --short HEAD)
VERSION := $(shell git describe --always --match "v*")
VERSION_PKG := github.com/weaveworks/flintlock/internal/version
VERSION_PKG := github.com/weaveworks-liquidmetal/flintlock/internal/version
OS := $(shell go env GOOS)
ARCH := $(shell go env GOARCH)
UNAME := $(shell uname -s)
Expand Down Expand Up @@ -98,13 +98,17 @@ generate-proto: $(BUF) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_GRPC) $(PROTO_GEN_GRPC_G

.PHONY: generate-di ## Generate the dependency injection code
generate-di: $(WIRE)
$(WIRE) gen github.com/weaveworks/flintlock/internal/inject
$(WIRE) gen github.com/weaveworks-liquidmetal/flintlock/internal/inject

##@ Linting

.PHONY: lint
lint: $(GOLANGCI_LINT) ## Lint code
$(GOLANGCI_LINT) run -v --fast=false
$(GOLANGCI_LINT) run -v --fast=false $(GOLANGCI_LINT_EXTRA_ARGS)

.PHONY: lint-fix
lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter
GOLANGCI_LINT_EXTRA_ARGS=--fix $(MAKE) lint

.PHONY: proto-lint
proto-lint: $(BUF) ## Lint protobuf/frpc
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[![GitHub](https://img.shields.io/github/license/weaveworks/flintlock)](https://img.shields.io/github/license/weaveworks/flintlock)
[![codecov](https://codecov.io/gh/weaveworks/flintlock/branch/main/graph/badge.svg?token=ZNPNRDI8Z0)](https://codecov.io/gh/weaveworks/flintlock)
[![Go Report Card](https://goreportcard.com/badge/github.com/weaveworks/flintlock)](https://goreportcard.com/report/github.com/weaveworks/flintlock)
[![Go Report Card](https://goreportcard.com/badge/github.com/weaveworks-liquidmetal/flintlock)](https://goreportcard.com/report/github.com/weaveworks-liquidmetal/flintlock)

## What is flintlock?

Expand Down Expand Up @@ -64,7 +64,7 @@ The table below shows you which versions of Firecracker are compatible with Flin
[quickstart]: ./docs/quick-start.md
[contrib]: ./CONTRIBUTING.md
[coc]: ./CODE_OF_CONDUCT.md
[issues]: https://github.com/weaveworks/flintlock/issues
[milestones]: https://github.com/weaveworks/flintlock/milestones
[issues]: https://github.com/weaveworks-liquidmetal/flintlock/issues
[milestones]: https://github.com/weaveworks-liquidmetal/flintlock/milestones
[adr]: ./docs/adr
[license]: ./LICENSE
2 changes: 1 addition & 1 deletion api/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/weaveworks/flintlock/api
module github.com/weaveworks-liquidmetal/flintlock/api

go 1.17

Expand Down
42 changes: 23 additions & 19 deletions api/services/microvm/v1alpha1/microvms.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3c115ce

Please sign in to comment.