diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c6773cbd..2ecf6f85 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -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:** diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 43838041..eb882b72 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -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:** diff --git a/.github/workflows/fork.yaml b/.github/workflows/fork.yaml index 91e7c435..068e7409 100644 --- a/.github/workflows/fork.yaml +++ b/.github/workflows/fork.yaml @@ -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 ${{ env.NEW_VERSION }}-macvtap` (A new [release](https://github.com/weaveworks/firecracker/releases) will be created.) @@ -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: ." + message: "There is a new version of Firecracker, complete the todo list here: ." channel: team-quick-silver color: green verbose: false diff --git a/.golangci.yml b/.golangci.yml index bc23dbbc..36436fc9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -97,3 +97,4 @@ linters: - nilnil - scopelint - tagliatelle + - gomoddirectives diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b0ef9ce8..11b4129e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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, @@ -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. @@ -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 @@ -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 @@ -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: @@ -497,7 +497,7 @@ The core team regularly processes incoming issues. There may be some delay over Every issue will be assigned a `priority/` 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 @@ -506,13 +506,13 @@ Every issue will be assigned a `priority/` 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. @@ -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. @@ -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 diff --git a/Makefile b/Makefile index 0e657fa4..eb26819e 100644 --- a/Makefile +++ b/Makefile @@ -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) @@ -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 diff --git a/README.md b/README.md index b077771a..2e765da0 100644 --- a/README.md +++ b/README.md @@ -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? @@ -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 diff --git a/api/go.mod b/api/go.mod index ed971bf8..2603d042 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module github.com/weaveworks/flintlock/api +module github.com/weaveworks-liquidmetal/flintlock/api go 1.17 diff --git a/api/services/microvm/v1alpha1/microvms.pb.go b/api/services/microvm/v1alpha1/microvms.pb.go index 2f7fb39a..4b9350bb 100644 --- a/api/services/microvm/v1alpha1/microvms.pb.go +++ b/api/services/microvm/v1alpha1/microvms.pb.go @@ -7,16 +7,17 @@ package v1alpha1 import ( + reflect "reflect" + sync "sync" + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - types "github.com/weaveworks/flintlock/api/types" + types "github.com/weaveworks-liquidmetal/flintlock/api/types" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" emptypb "google.golang.org/protobuf/types/known/emptypb" _ "google.golang.org/protobuf/types/known/fieldmaskpb" - reflect "reflect" - sync "sync" ) const ( @@ -556,22 +557,25 @@ func file_services_microvm_v1alpha1_microvms_proto_rawDescGZIP() []byte { return file_services_microvm_v1alpha1_microvms_proto_rawDescData } -var file_services_microvm_v1alpha1_microvms_proto_msgTypes = make([]protoimpl.MessageInfo, 9) -var file_services_microvm_v1alpha1_microvms_proto_goTypes = []interface{}{ - (*CreateMicroVMRequest)(nil), // 0: microvm.services.api.v1alpha1.CreateMicroVMRequest - (*CreateMicroVMResponse)(nil), // 1: microvm.services.api.v1alpha1.CreateMicroVMResponse - (*DeleteMicroVMRequest)(nil), // 2: microvm.services.api.v1alpha1.DeleteMicroVMRequest - (*GetMicroVMRequest)(nil), // 3: microvm.services.api.v1alpha1.GetMicroVMRequest - (*GetMicroVMResponse)(nil), // 4: microvm.services.api.v1alpha1.GetMicroVMResponse - (*ListMicroVMsRequest)(nil), // 5: microvm.services.api.v1alpha1.ListMicroVMsRequest - (*ListMicroVMsResponse)(nil), // 6: microvm.services.api.v1alpha1.ListMicroVMsResponse - (*ListMessage)(nil), // 7: microvm.services.api.v1alpha1.ListMessage - nil, // 8: microvm.services.api.v1alpha1.CreateMicroVMRequest.MetadataEntry - (*types.MicroVMSpec)(nil), // 9: flintlock.types.MicroVMSpec - (*types.MicroVM)(nil), // 10: flintlock.types.MicroVM - (*anypb.Any)(nil), // 11: google.protobuf.Any - (*emptypb.Empty)(nil), // 12: google.protobuf.Empty -} +var ( + file_services_microvm_v1alpha1_microvms_proto_msgTypes = make([]protoimpl.MessageInfo, 9) + file_services_microvm_v1alpha1_microvms_proto_goTypes = []interface{}{ + (*CreateMicroVMRequest)(nil), // 0: microvm.services.api.v1alpha1.CreateMicroVMRequest + (*CreateMicroVMResponse)(nil), // 1: microvm.services.api.v1alpha1.CreateMicroVMResponse + (*DeleteMicroVMRequest)(nil), // 2: microvm.services.api.v1alpha1.DeleteMicroVMRequest + (*GetMicroVMRequest)(nil), // 3: microvm.services.api.v1alpha1.GetMicroVMRequest + (*GetMicroVMResponse)(nil), // 4: microvm.services.api.v1alpha1.GetMicroVMResponse + (*ListMicroVMsRequest)(nil), // 5: microvm.services.api.v1alpha1.ListMicroVMsRequest + (*ListMicroVMsResponse)(nil), // 6: microvm.services.api.v1alpha1.ListMicroVMsResponse + (*ListMessage)(nil), // 7: microvm.services.api.v1alpha1.ListMessage + nil, // 8: microvm.services.api.v1alpha1.CreateMicroVMRequest.MetadataEntry + (*types.MicroVMSpec)(nil), // 9: flintlock.types.MicroVMSpec + (*types.MicroVM)(nil), // 10: flintlock.types.MicroVM + (*anypb.Any)(nil), // 11: google.protobuf.Any + (*emptypb.Empty)(nil), // 12: google.protobuf.Empty + } +) + var file_services_microvm_v1alpha1_microvms_proto_depIdxs = []int32{ 9, // 0: microvm.services.api.v1alpha1.CreateMicroVMRequest.microvm:type_name -> flintlock.types.MicroVMSpec 8, // 1: microvm.services.api.v1alpha1.CreateMicroVMRequest.metadata:type_name -> microvm.services.api.v1alpha1.CreateMicroVMRequest.MetadataEntry diff --git a/api/services/microvm/v1alpha1/microvms.pb.gw.go b/api/services/microvm/v1alpha1/microvms.pb.gw.go index 321ced4f..98cd0a7b 100644 --- a/api/services/microvm/v1alpha1/microvms.pb.gw.go +++ b/api/services/microvm/v1alpha1/microvms.pb.gw.go @@ -24,17 +24,17 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join - var ( - filter_MicroVM_CreateMicroVM_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join ) +var filter_MicroVM_CreateMicroVM_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + func request_MicroVM_CreateMicroVM_0(ctx context.Context, marshaler runtime.Marshaler, client MicroVMClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq CreateMicroVMRequest var metadata runtime.ServerMetadata @@ -48,7 +48,6 @@ func request_MicroVM_CreateMicroVM_0(ctx context.Context, marshaler runtime.Mars msg, err := client.CreateMicroVM(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_MicroVM_CreateMicroVM_0(ctx context.Context, marshaler runtime.Marshaler, server MicroVMServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -64,7 +63,6 @@ func local_request_MicroVM_CreateMicroVM_0(ctx context.Context, marshaler runtim msg, err := server.CreateMicroVM(ctx, &protoReq) return msg, metadata, err - } func request_MicroVM_DeleteMicroVM_0(ctx context.Context, marshaler runtime.Marshaler, client MicroVMClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -90,7 +88,6 @@ func request_MicroVM_DeleteMicroVM_0(ctx context.Context, marshaler runtime.Mars msg, err := client.DeleteMicroVM(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_MicroVM_DeleteMicroVM_0(ctx context.Context, marshaler runtime.Marshaler, server MicroVMServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -116,7 +113,6 @@ func local_request_MicroVM_DeleteMicroVM_0(ctx context.Context, marshaler runtim msg, err := server.DeleteMicroVM(ctx, &protoReq) return msg, metadata, err - } func request_MicroVM_GetMicroVM_0(ctx context.Context, marshaler runtime.Marshaler, client MicroVMClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -142,7 +138,6 @@ func request_MicroVM_GetMicroVM_0(ctx context.Context, marshaler runtime.Marshal msg, err := client.GetMicroVM(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_MicroVM_GetMicroVM_0(ctx context.Context, marshaler runtime.Marshaler, server MicroVMServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -168,12 +163,9 @@ func local_request_MicroVM_GetMicroVM_0(ctx context.Context, marshaler runtime.M msg, err := server.GetMicroVM(ctx, &protoReq) return msg, metadata, err - } -var ( - filter_MicroVM_ListMicroVMs_0 = &utilities.DoubleArray{Encoding: map[string]int{"namespace": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} -) +var filter_MicroVM_ListMicroVMs_0 = &utilities.DoubleArray{Encoding: map[string]int{"namespace": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} func request_MicroVM_ListMicroVMs_0(ctx context.Context, marshaler runtime.Marshaler, client MicroVMClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ListMicroVMsRequest @@ -205,7 +197,6 @@ func request_MicroVM_ListMicroVMs_0(ctx context.Context, marshaler runtime.Marsh msg, err := client.ListMicroVMs(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_MicroVM_ListMicroVMs_0(ctx context.Context, marshaler runtime.Marshaler, server MicroVMServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -238,7 +229,6 @@ func local_request_MicroVM_ListMicroVMs_0(ctx context.Context, marshaler runtime msg, err := server.ListMicroVMs(ctx, &protoReq) return msg, metadata, err - } func request_MicroVM_ListMicroVMsStream_0(ctx context.Context, marshaler runtime.Marshaler, client MicroVMClient, req *http.Request, pathParams map[string]string) (MicroVM_ListMicroVMsStreamClient, runtime.ServerMetadata, error) { @@ -263,7 +253,6 @@ func request_MicroVM_ListMicroVMsStream_0(ctx context.Context, marshaler runtime } metadata.HeaderMD = header return stream, metadata, nil - } // RegisterMicroVMHandlerServer registers the http handlers for service MicroVM to "mux". @@ -271,7 +260,6 @@ func request_MicroVM_ListMicroVMsStream_0(ctx context.Context, marshaler runtime // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterMicroVMHandlerFromEndpoint instead. func RegisterMicroVMHandlerServer(ctx context.Context, mux *runtime.ServeMux, server MicroVMServer) error { - mux.Handle("POST", pattern_MicroVM_CreateMicroVM_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -292,7 +280,6 @@ func RegisterMicroVMHandlerServer(ctx context.Context, mux *runtime.ServeMux, se } forward_MicroVM_CreateMicroVM_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) mux.Handle("DELETE", pattern_MicroVM_DeleteMicroVM_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -315,7 +302,6 @@ func RegisterMicroVMHandlerServer(ctx context.Context, mux *runtime.ServeMux, se } forward_MicroVM_DeleteMicroVM_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) mux.Handle("GET", pattern_MicroVM_GetMicroVM_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -338,7 +324,6 @@ func RegisterMicroVMHandlerServer(ctx context.Context, mux *runtime.ServeMux, se } forward_MicroVM_GetMicroVM_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) mux.Handle("GET", pattern_MicroVM_ListMicroVMs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -361,7 +346,6 @@ func RegisterMicroVMHandlerServer(ctx context.Context, mux *runtime.ServeMux, se } forward_MicroVM_ListMicroVMs_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) mux.Handle("POST", pattern_MicroVM_ListMicroVMsStream_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -411,7 +395,6 @@ func RegisterMicroVMHandler(ctx context.Context, mux *runtime.ServeMux, conn *gr // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "MicroVMClient" to call the correct interceptors. func RegisterMicroVMHandlerClient(ctx context.Context, mux *runtime.ServeMux, client MicroVMClient) error { - mux.Handle("POST", pattern_MicroVM_CreateMicroVM_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -429,7 +412,6 @@ func RegisterMicroVMHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl } forward_MicroVM_CreateMicroVM_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) mux.Handle("DELETE", pattern_MicroVM_DeleteMicroVM_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -449,7 +431,6 @@ func RegisterMicroVMHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl } forward_MicroVM_DeleteMicroVM_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) mux.Handle("GET", pattern_MicroVM_GetMicroVM_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -469,7 +450,6 @@ func RegisterMicroVMHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl } forward_MicroVM_GetMicroVM_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) mux.Handle("GET", pattern_MicroVM_ListMicroVMs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -489,7 +469,6 @@ func RegisterMicroVMHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl } forward_MicroVM_ListMicroVMs_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) mux.Handle("POST", pattern_MicroVM_ListMicroVMsStream_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -509,7 +488,6 @@ func RegisterMicroVMHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl } forward_MicroVM_ListMicroVMsStream_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - }) return nil diff --git a/api/services/microvm/v1alpha1/microvms.proto b/api/services/microvm/v1alpha1/microvms.proto index b0c140e7..b59824e9 100644 --- a/api/services/microvm/v1alpha1/microvms.proto +++ b/api/services/microvm/v1alpha1/microvms.proto @@ -9,7 +9,7 @@ import "google/api/annotations.proto"; import "protoc-gen-openapiv2/options/annotations.proto"; import "types/microvm.proto"; -option go_package = "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1"; +option go_package = "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { diff --git a/api/services/microvm/v1alpha1/microvms_grpc.pb.go b/api/services/microvm/v1alpha1/microvms_grpc.pb.go index bb7e8697..236e464b 100644 --- a/api/services/microvm/v1alpha1/microvms_grpc.pb.go +++ b/api/services/microvm/v1alpha1/microvms_grpc.pb.go @@ -4,6 +4,7 @@ package v1alpha1 import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -114,21 +115,24 @@ type MicroVMServer interface { } // UnimplementedMicroVMServer should be embedded to have forward compatible implementations. -type UnimplementedMicroVMServer struct { -} +type UnimplementedMicroVMServer struct{} func (UnimplementedMicroVMServer) CreateMicroVM(context.Context, *CreateMicroVMRequest) (*CreateMicroVMResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateMicroVM not implemented") } + func (UnimplementedMicroVMServer) DeleteMicroVM(context.Context, *DeleteMicroVMRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteMicroVM not implemented") } + func (UnimplementedMicroVMServer) GetMicroVM(context.Context, *GetMicroVMRequest) (*GetMicroVMResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetMicroVM not implemented") } + func (UnimplementedMicroVMServer) ListMicroVMs(context.Context, *ListMicroVMsRequest) (*ListMicroVMsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListMicroVMs not implemented") } + func (UnimplementedMicroVMServer) ListMicroVMsStream(*ListMicroVMsRequest, MicroVM_ListMicroVMsStreamServer) error { return status.Errorf(codes.Unimplemented, "method ListMicroVMsStream not implemented") } diff --git a/api/types/microvm.pb.go b/api/types/microvm.pb.go index ea574e0f..a6cc5d24 100644 --- a/api/types/microvm.pb.go +++ b/api/types/microvm.pb.go @@ -7,11 +7,12 @@ package types import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" - reflect "reflect" - sync "sync" ) const ( @@ -797,7 +798,7 @@ type VolumeSource struct { unknownFields protoimpl.UnknownFields // Container is used to specify a source of a volume as a OCI container. - ContainerSource *string `protobuf:"bytes,1,opt,name=container_source,json=containerSource,proto3,oneof" json:"container_source,omitempty"` //TODO: add CSI + ContainerSource *string `protobuf:"bytes,1,opt,name=container_source,json=containerSource,proto3,oneof" json:"container_source,omitempty"` // TODO: add CSI } func (x *VolumeSource) Reset() { @@ -1376,32 +1377,35 @@ func file_types_microvm_proto_rawDescGZIP() []byte { return file_types_microvm_proto_rawDescData } -var file_types_microvm_proto_enumTypes = make([]protoimpl.EnumInfo, 3) -var file_types_microvm_proto_msgTypes = make([]protoimpl.MessageInfo, 18) -var file_types_microvm_proto_goTypes = []interface{}{ - (NetworkInterface_IfaceType)(0), // 0: flintlock.types.NetworkInterface.IfaceType - (MicroVMStatus_MicroVMState)(0), // 1: flintlock.types.MicroVMStatus.MicroVMState - (Mount_MountType)(0), // 2: flintlock.types.Mount.MountType - (*MicroVM)(nil), // 3: flintlock.types.MicroVM - (*MicroVMSpec)(nil), // 4: flintlock.types.MicroVMSpec - (*Kernel)(nil), // 5: flintlock.types.Kernel - (*Initrd)(nil), // 6: flintlock.types.Initrd - (*NetworkInterface)(nil), // 7: flintlock.types.NetworkInterface - (*StaticAddress)(nil), // 8: flintlock.types.StaticAddress - (*Volume)(nil), // 9: flintlock.types.Volume - (*VolumeSource)(nil), // 10: flintlock.types.VolumeSource - (*ContainerVolumeSource)(nil), // 11: flintlock.types.ContainerVolumeSource - (*MicroVMStatus)(nil), // 12: flintlock.types.MicroVMStatus - (*VolumeStatus)(nil), // 13: flintlock.types.VolumeStatus - (*Mount)(nil), // 14: flintlock.types.Mount - (*NetworkInterfaceStatus)(nil), // 15: flintlock.types.NetworkInterfaceStatus - nil, // 16: flintlock.types.MicroVMSpec.LabelsEntry - nil, // 17: flintlock.types.MicroVMSpec.MetadataEntry - nil, // 18: flintlock.types.Kernel.CmdlineEntry - nil, // 19: flintlock.types.MicroVMStatus.VolumesEntry - nil, // 20: flintlock.types.MicroVMStatus.NetworkInterfacesEntry - (*timestamppb.Timestamp)(nil), // 21: google.protobuf.Timestamp -} +var ( + file_types_microvm_proto_enumTypes = make([]protoimpl.EnumInfo, 3) + file_types_microvm_proto_msgTypes = make([]protoimpl.MessageInfo, 18) + file_types_microvm_proto_goTypes = []interface{}{ + (NetworkInterface_IfaceType)(0), // 0: flintlock.types.NetworkInterface.IfaceType + (MicroVMStatus_MicroVMState)(0), // 1: flintlock.types.MicroVMStatus.MicroVMState + (Mount_MountType)(0), // 2: flintlock.types.Mount.MountType + (*MicroVM)(nil), // 3: flintlock.types.MicroVM + (*MicroVMSpec)(nil), // 4: flintlock.types.MicroVMSpec + (*Kernel)(nil), // 5: flintlock.types.Kernel + (*Initrd)(nil), // 6: flintlock.types.Initrd + (*NetworkInterface)(nil), // 7: flintlock.types.NetworkInterface + (*StaticAddress)(nil), // 8: flintlock.types.StaticAddress + (*Volume)(nil), // 9: flintlock.types.Volume + (*VolumeSource)(nil), // 10: flintlock.types.VolumeSource + (*ContainerVolumeSource)(nil), // 11: flintlock.types.ContainerVolumeSource + (*MicroVMStatus)(nil), // 12: flintlock.types.MicroVMStatus + (*VolumeStatus)(nil), // 13: flintlock.types.VolumeStatus + (*Mount)(nil), // 14: flintlock.types.Mount + (*NetworkInterfaceStatus)(nil), // 15: flintlock.types.NetworkInterfaceStatus + nil, // 16: flintlock.types.MicroVMSpec.LabelsEntry + nil, // 17: flintlock.types.MicroVMSpec.MetadataEntry + nil, // 18: flintlock.types.Kernel.CmdlineEntry + nil, // 19: flintlock.types.MicroVMStatus.VolumesEntry + nil, // 20: flintlock.types.MicroVMStatus.NetworkInterfacesEntry + (*timestamppb.Timestamp)(nil), // 21: google.protobuf.Timestamp + } +) + var file_types_microvm_proto_depIdxs = []int32{ 4, // 0: flintlock.types.MicroVM.spec:type_name -> flintlock.types.MicroVMSpec 12, // 1: flintlock.types.MicroVM.status:type_name -> flintlock.types.MicroVMStatus diff --git a/api/types/microvm.proto b/api/types/microvm.proto index c2d506f8..514e2126 100644 --- a/api/types/microvm.proto +++ b/api/types/microvm.proto @@ -4,7 +4,7 @@ package flintlock.types; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/weaveworks/flintlock/api/types;types"; +option go_package = "github.com/weaveworks-liquidmetal/flintlock/api/types;types"; // MicroVM represents a microvm machine that is created via a provider. message MicroVM { diff --git a/client/cloudinit/instance/metadata_test.go b/client/cloudinit/instance/metadata_test.go index d5c2a995..09dd1a0e 100644 --- a/client/cloudinit/instance/metadata_test.go +++ b/client/cloudinit/instance/metadata_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/client/cloudinit/instance" + "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/instance" ) const ( diff --git a/client/go.mod b/client/go.mod index 0165a87a..4ff71d9f 100644 --- a/client/go.mod +++ b/client/go.mod @@ -1,4 +1,4 @@ -module github.com/weaveworks/flintlock/client +module github.com/weaveworks-liquidmetal/flintlock/client go 1.17 diff --git a/cmd/flintlock-metrics/main.go b/cmd/flintlock-metrics/main.go index 53bf5f82..ef4b66ef 100644 --- a/cmd/flintlock-metrics/main.go +++ b/cmd/flintlock-metrics/main.go @@ -4,8 +4,7 @@ import ( "os" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/internal/command/metrics" + "github.com/weaveworks-liquidmetal/flintlock/internal/command/metrics" ) func main() { diff --git a/cmd/flintlockd/main.go b/cmd/flintlockd/main.go index cadf9e98..750994d3 100644 --- a/cmd/flintlockd/main.go +++ b/cmd/flintlockd/main.go @@ -3,7 +3,7 @@ package main import ( "log" - "github.com/weaveworks/flintlock/internal/command" + "github.com/weaveworks-liquidmetal/flintlock/internal/command" ) func main() { diff --git a/core/application/app.go b/core/application/app.go index 0a3ac84e..e7899051 100644 --- a/core/application/app.go +++ b/core/application/app.go @@ -1,7 +1,7 @@ package application import ( - "github.com/weaveworks/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) // App is the interface for the core application. In the future this could be split diff --git a/core/application/app_test.go b/core/application/app_test.go index 297fbd8f..0476973e 100644 --- a/core/application/app_test.go +++ b/core/application/app_test.go @@ -12,14 +12,14 @@ import ( "github.com/spf13/afero" "sigs.k8s.io/yaml" - "github.com/weaveworks/flintlock/api/events" - "github.com/weaveworks/flintlock/client/cloudinit/instance" - "github.com/weaveworks/flintlock/core/application" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/mock" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/ptr" + "github.com/weaveworks-liquidmetal/flintlock/api/events" + "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/instance" + "github.com/weaveworks-liquidmetal/flintlock/core/application" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/ptr" ) const ( diff --git a/core/application/commands.go b/core/application/commands.go index 5061590a..16542911 100644 --- a/core/application/commands.go +++ b/core/application/commands.go @@ -6,16 +6,15 @@ import ( "fmt" "github.com/sirupsen/logrus" + "github.com/weaveworks-liquidmetal/flintlock/api/events" + "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit" + "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/instance" + coreerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" "sigs.k8s.io/yaml" - - "github.com/weaveworks/flintlock/api/events" - "github.com/weaveworks/flintlock/client/cloudinit" - "github.com/weaveworks/flintlock/client/cloudinit/instance" - coreerrs "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/log" ) func (a *app) CreateMicroVM(ctx context.Context, mvm *models.MicroVM) (*models.MicroVM, error) { diff --git a/core/application/errors.go b/core/application/errors.go index 2ae9603c..61917bfc 100644 --- a/core/application/errors.go +++ b/core/application/errors.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) var errUIDRequired = errors.New("uid is required") diff --git a/core/application/query.go b/core/application/query.go index 1cd50ce8..551ee87b 100644 --- a/core/application/query.go +++ b/core/application/query.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) func (a *app) GetMicroVM(ctx context.Context, uid string) (*models.MicroVM, error) { diff --git a/core/application/reconcile.go b/core/application/reconcile.go index cb428239..63bc9d41 100644 --- a/core/application/reconcile.go +++ b/core/application/reconcile.go @@ -6,15 +6,14 @@ import ( "time" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/api/events" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/plans" - "github.com/weaveworks/flintlock/core/ports" - portsctx "github.com/weaveworks/flintlock/core/ports/context" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/api/events" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/plans" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) const backoffBaseInSeconds = 20 diff --git a/core/models/network_test.go b/core/models/network_test.go index cf336947..03cbc67e 100644 --- a/core/models/network_test.go +++ b/core/models/network_test.go @@ -4,7 +4,7 @@ import ( "testing" g "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) func TestIPAddressCIDR_IsIPv4(t *testing.T) { diff --git a/core/models/vmid.go b/core/models/vmid.go index 393b9ec0..b49a5b4d 100644 --- a/core/models/vmid.go +++ b/core/models/vmid.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - coreerrs "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/pkg/defaults" + coreerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) const ( diff --git a/core/models/vmid_test.go b/core/models/vmid_test.go index 00b50807..f2b4eed7 100644 --- a/core/models/vmid_test.go +++ b/core/models/vmid_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) const ( diff --git a/core/plans/helper_test.go b/core/plans/helper_test.go index a5a03163..0a33a023 100644 --- a/core/plans/helper_test.go +++ b/core/plans/helper_test.go @@ -5,9 +5,9 @@ import ( "github.com/golang/mock/gomock" "github.com/spf13/afero" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/mock" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) const ( diff --git a/core/plans/matcher_test.go b/core/plans/matcher_test.go index 74139513..9524fe70 100644 --- a/core/plans/matcher_test.go +++ b/core/plans/matcher_test.go @@ -3,8 +3,8 @@ package plans_test import ( "strings" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) type hostDeviceNameMatcher struct{} diff --git a/core/plans/microvm_create_update.go b/core/plans/microvm_create_update.go index 3c06baac..46ef42aa 100644 --- a/core/plans/microvm_create_update.go +++ b/core/plans/microvm_create_update.go @@ -4,15 +4,15 @@ import ( "context" "fmt" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - portsctx "github.com/weaveworks/flintlock/core/ports/context" - "github.com/weaveworks/flintlock/core/steps/microvm" - "github.com/weaveworks/flintlock/core/steps/network" - "github.com/weaveworks/flintlock/core/steps/runtime" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/network" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) type CreateOrUpdatePlanInput struct { diff --git a/core/plans/microvm_create_update_test.go b/core/plans/microvm_create_update_test.go index 1301b918..37d1b427 100644 --- a/core/plans/microvm_create_update_test.go +++ b/core/plans/microvm_create_update_test.go @@ -7,10 +7,10 @@ import ( "github.com/golang/mock/gomock" . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/plans" - "github.com/weaveworks/flintlock/core/ports" - portsctx "github.com/weaveworks/flintlock/core/ports/context" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/plans" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" ) func TestMicroVMCreateOrUpdatePlan(t *testing.T) { diff --git a/core/plans/microvm_delete.go b/core/plans/microvm_delete.go index 066ccd56..43e562af 100644 --- a/core/plans/microvm_delete.go +++ b/core/plans/microvm_delete.go @@ -5,17 +5,17 @@ import ( "fmt" "path" - "github.com/weaveworks/flintlock/api/events" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - portsctx "github.com/weaveworks/flintlock/core/ports/context" - "github.com/weaveworks/flintlock/core/steps/event" - "github.com/weaveworks/flintlock/core/steps/microvm" - "github.com/weaveworks/flintlock/core/steps/network" - "github.com/weaveworks/flintlock/core/steps/runtime" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/api/events" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/event" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/network" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) type DeletePlanInput struct { diff --git a/core/plans/microvm_delete_test.go b/core/plans/microvm_delete_test.go index 7512e190..4f7d34c3 100644 --- a/core/plans/microvm_delete_test.go +++ b/core/plans/microvm_delete_test.go @@ -8,11 +8,11 @@ import ( "github.com/golang/mock/gomock" . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/plans" - "github.com/weaveworks/flintlock/core/ports" - portsctx "github.com/weaveworks/flintlock/core/ports/context" - "github.com/weaveworks/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/plans" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) func TestMicroVMDeletePlan(t *testing.T) { diff --git a/core/plans/types.go b/core/plans/types.go index 8693f593..02452ede 100644 --- a/core/plans/types.go +++ b/core/plans/types.go @@ -2,8 +2,7 @@ package plans import ( "github.com/spf13/afero" - - "github.com/weaveworks/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) // Providers input is a type to be used as input to plans. diff --git a/core/ports/context/context.go b/core/ports/context/context.go index b405b36f..b66243c1 100644 --- a/core/ports/context/context.go +++ b/core/ports/context/context.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/weaveworks/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) type portsCtxKeyType string diff --git a/core/ports/repositories.go b/core/ports/repositories.go index 3b7bbb52..39529313 100644 --- a/core/ports/repositories.go +++ b/core/ports/repositories.go @@ -3,7 +3,7 @@ package ports import ( "context" - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) type RepositoryGetOptions struct { diff --git a/core/ports/services.go b/core/ports/services.go index 3cc78497..f5514b92 100644 --- a/core/ports/services.go +++ b/core/ports/services.go @@ -4,8 +4,8 @@ import ( "context" "time" - mvmv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - "github.com/weaveworks/flintlock/core/models" + mvmv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) // MicroVMService is the port definition for a microvm service. diff --git a/core/ports/usecases.go b/core/ports/usecases.go index acf9188b..35ce8805 100644 --- a/core/ports/usecases.go +++ b/core/ports/usecases.go @@ -3,7 +3,7 @@ package ports import ( "context" - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) // MicroVMCommandUseCases is the interface for uses cases that are actions (a.k.a commands) against a microvm. diff --git a/core/steps/event/publish.go b/core/steps/event/publish.go index 49051c4a..63f73c5c 100644 --- a/core/steps/event/publish.go +++ b/core/steps/event/publish.go @@ -5,10 +5,9 @@ import ( "fmt" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewPublish(topic string, event interface{}, eventSvc ports.EventService) planner.Procedure { diff --git a/core/steps/event/publish_test.go b/core/steps/event/publish_test.go index 77b4620f..4c9ae3cf 100644 --- a/core/steps/event/publish_test.go +++ b/core/steps/event/publish_test.go @@ -7,9 +7,9 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/api/events" - "github.com/weaveworks/flintlock/core/steps/event" - "github.com/weaveworks/flintlock/infrastructure/mock" + "github.com/weaveworks-liquidmetal/flintlock/api/events" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/event" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) const ( diff --git a/core/steps/microvm/create.go b/core/steps/microvm/create.go index 266c0e02..58111bf5 100644 --- a/core/steps/microvm/create.go +++ b/core/steps/microvm/create.go @@ -5,12 +5,11 @@ import ( "fmt" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewCreateStep(vm *models.MicroVM, vmSvc ports.MicroVMService) planner.Procedure { diff --git a/core/steps/microvm/create_test.go b/core/steps/microvm/create_test.go index bd8881b8..d3e4d353 100644 --- a/core/steps/microvm/create_test.go +++ b/core/steps/microvm/create_test.go @@ -7,11 +7,11 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/core/steps/microvm" - "github.com/weaveworks/flintlock/infrastructure/mock" + internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMToCreate() *models.MicroVM { diff --git a/core/steps/microvm/delete.go b/core/steps/microvm/delete.go index b00d18cb..2cb033d4 100644 --- a/core/steps/microvm/delete.go +++ b/core/steps/microvm/delete.go @@ -5,12 +5,11 @@ import ( "fmt" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewDeleteStep(vm *models.MicroVM, vmSvc ports.MicroVMService) planner.Procedure { diff --git a/core/steps/microvm/delete_test.go b/core/steps/microvm/delete_test.go index 18b74593..06c90f61 100644 --- a/core/steps/microvm/delete_test.go +++ b/core/steps/microvm/delete_test.go @@ -7,11 +7,11 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/core/steps/microvm" - "github.com/weaveworks/flintlock/infrastructure/mock" + internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMToDelete() *models.MicroVM { diff --git a/core/steps/microvm/start.go b/core/steps/microvm/start.go index 9d41e55e..6fa7c289 100644 --- a/core/steps/microvm/start.go +++ b/core/steps/microvm/start.go @@ -6,12 +6,11 @@ import ( "time" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewStartStep( diff --git a/core/steps/microvm/start_test.go b/core/steps/microvm/start_test.go index 1f23a4ea..64adaddf 100644 --- a/core/steps/microvm/start_test.go +++ b/core/steps/microvm/start_test.go @@ -7,11 +7,11 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/core/steps/microvm" - "github.com/weaveworks/flintlock/infrastructure/mock" + internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) const bootTimeInSeconds = 1 diff --git a/core/steps/network/interface_create.go b/core/steps/network/interface_create.go index 43963140..979430fb 100644 --- a/core/steps/network/interface_create.go +++ b/core/steps/network/interface_create.go @@ -5,13 +5,12 @@ import ( "fmt" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/network" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/network" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewNetworkInterface(vmid *models.VMID, @@ -80,7 +79,7 @@ func (s *createInterface) Do(ctx context.Context) ([]planner.Procedure, error) { if s.status.HostDeviceName == "" { ifaceName, err := network.NewIfaceName(s.iface.Type) if err != nil { - return nil, err + return nil, fmt.Errorf("creating network interface name: %w", err) } s.status.HostDeviceName = ifaceName diff --git a/core/steps/network/interface_create_test.go b/core/steps/network/interface_create_test.go index 94f5304e..4d30f6f2 100644 --- a/core/steps/network/interface_create_test.go +++ b/core/steps/network/interface_create_test.go @@ -6,11 +6,11 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/core/steps/network" - "github.com/weaveworks/flintlock/infrastructure/mock" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/network" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func TestNewNetworkInterface_everythingIsEmpty(t *testing.T) { diff --git a/core/steps/network/interface_delete.go b/core/steps/network/interface_delete.go index dbc0c464..5aae6e07 100644 --- a/core/steps/network/interface_delete.go +++ b/core/steps/network/interface_delete.go @@ -5,12 +5,11 @@ import ( "fmt" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func DeleteNetworkInterface(vmid *models.VMID, diff --git a/core/steps/network/interface_delete_test.go b/core/steps/network/interface_delete_test.go index e986b9f4..e6c023c7 100644 --- a/core/steps/network/interface_delete_test.go +++ b/core/steps/network/interface_delete_test.go @@ -7,11 +7,11 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" "github.com/vishvananda/netlink" - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/core/steps/network" - "github.com/weaveworks/flintlock/infrastructure/mock" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/network" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func TestDeleteNetworkInterface_doesNotExist(t *testing.T) { diff --git a/core/steps/network/matcher_test.go b/core/steps/network/matcher_test.go index 9fc0c9e4..41c2c69e 100644 --- a/core/steps/network/matcher_test.go +++ b/core/steps/network/matcher_test.go @@ -3,7 +3,7 @@ package network_test import ( "strings" - "github.com/weaveworks/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) type hostDeviceNameMatcher struct{} diff --git a/core/steps/network/testconst_test.go b/core/steps/network/testconst_test.go index 5a2596e9..12025cc1 100644 --- a/core/steps/network/testconst_test.go +++ b/core/steps/network/testconst_test.go @@ -1,6 +1,6 @@ package network_test -import "github.com/weaveworks/flintlock/core/models" +import "github.com/weaveworks-liquidmetal/flintlock/core/models" const ( vmName = "testvm" diff --git a/core/steps/runtime/dir_create.go b/core/steps/runtime/dir_create.go index 427d0fa5..4a5688dd 100644 --- a/core/steps/runtime/dir_create.go +++ b/core/steps/runtime/dir_create.go @@ -7,9 +7,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/afero" - - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewCreateDirectory(dir string, mode os.FileMode, fs afero.Fs) planner.Procedure { diff --git a/core/steps/runtime/dir_create_test.go b/core/steps/runtime/dir_create_test.go index 5402b359..c9eebec6 100644 --- a/core/steps/runtime/dir_create_test.go +++ b/core/steps/runtime/dir_create_test.go @@ -9,7 +9,7 @@ import ( g "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/weaveworks/flintlock/core/steps/runtime" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" ) func TestCreateDirectory_NotExists(t *testing.T) { diff --git a/core/steps/runtime/dir_delete.go b/core/steps/runtime/dir_delete.go index 9c7ac696..9a5d1c60 100644 --- a/core/steps/runtime/dir_delete.go +++ b/core/steps/runtime/dir_delete.go @@ -6,9 +6,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/afero" - - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewDeleteDirectory(dir string, fs afero.Fs) planner.Procedure { diff --git a/core/steps/runtime/dir_delete_test.go b/core/steps/runtime/dir_delete_test.go index 656b240c..24f73dfc 100644 --- a/core/steps/runtime/dir_delete_test.go +++ b/core/steps/runtime/dir_delete_test.go @@ -7,7 +7,7 @@ import ( g "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/weaveworks/flintlock/core/steps/runtime" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" ) func TestDeleteDirectory_NotExists(t *testing.T) { diff --git a/core/steps/runtime/initrd_mount.go b/core/steps/runtime/initrd_mount.go index b059f2ce..8284eb0c 100644 --- a/core/steps/runtime/initrd_mount.go +++ b/core/steps/runtime/initrd_mount.go @@ -5,12 +5,11 @@ import ( "fmt" "github.com/sirupsen/logrus" - - cerrs "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + cerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewInitrdMount(vm *models.MicroVM, imageService ports.ImageService) planner.Procedure { diff --git a/core/steps/runtime/initrd_mount_test.go b/core/steps/runtime/initrd_mount_test.go index 10ed55d4..03c45d42 100644 --- a/core/steps/runtime/initrd_mount_test.go +++ b/core/steps/runtime/initrd_mount_test.go @@ -7,11 +7,11 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/core/steps/runtime" - "github.com/weaveworks/flintlock/infrastructure/mock" + internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMWithInitrd() *models.MicroVM { diff --git a/core/steps/runtime/kernel_mount.go b/core/steps/runtime/kernel_mount.go index bea23fbf..77be30a2 100644 --- a/core/steps/runtime/kernel_mount.go +++ b/core/steps/runtime/kernel_mount.go @@ -5,12 +5,11 @@ import ( "fmt" "github.com/sirupsen/logrus" - - cerrs "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + cerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewKernelMount(vm *models.MicroVM, imageService ports.ImageService) planner.Procedure { diff --git a/core/steps/runtime/kernel_mount_test.go b/core/steps/runtime/kernel_mount_test.go index 630b9329..ed30e41f 100644 --- a/core/steps/runtime/kernel_mount_test.go +++ b/core/steps/runtime/kernel_mount_test.go @@ -7,11 +7,11 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/core/steps/runtime" - "github.com/weaveworks/flintlock/infrastructure/mock" + internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMWithKernel() *models.MicroVM { diff --git a/core/steps/runtime/repo_release.go b/core/steps/runtime/repo_release.go index efe971bd..05c14052 100644 --- a/core/steps/runtime/repo_release.go +++ b/core/steps/runtime/repo_release.go @@ -5,12 +5,11 @@ import ( "fmt" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewRepoRelease(vm *models.MicroVM, repo ports.MicroVMRepository) planner.Procedure { diff --git a/core/steps/runtime/repo_release_test.go b/core/steps/runtime/repo_release_test.go index 8e30e10f..379f4fa5 100644 --- a/core/steps/runtime/repo_release_test.go +++ b/core/steps/runtime/repo_release_test.go @@ -7,10 +7,10 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" - internalerrors "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/steps/runtime" - "github.com/weaveworks/flintlock/infrastructure/mock" + internalerrors "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVM() *models.MicroVM { diff --git a/core/steps/runtime/volume_mount.go b/core/steps/runtime/volume_mount.go index b9d26014..301b12d0 100644 --- a/core/steps/runtime/volume_mount.go +++ b/core/steps/runtime/volume_mount.go @@ -5,12 +5,11 @@ import ( "fmt" "github.com/sirupsen/logrus" - - cerrs "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/planner" + cerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewVolumeMount(vmid *models.VMID, diff --git a/core/steps/runtime/volume_mount_test.go b/core/steps/runtime/volume_mount_test.go index 1fb2cf70..c0016578 100644 --- a/core/steps/runtime/volume_mount_test.go +++ b/core/steps/runtime/volume_mount_test.go @@ -7,11 +7,11 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/core/steps/runtime" - "github.com/weaveworks/flintlock/infrastructure/mock" + internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMWithMount() *models.MicroVM { diff --git a/docs/adr/0003-grpc-validation.md b/docs/adr/0003-grpc-validation.md index 1ae6cf55..3227f36c 100644 --- a/docs/adr/0003-grpc-validation.md +++ b/docs/adr/0003-grpc-validation.md @@ -23,7 +23,7 @@ As a result, neither of these solutions is fit for purpose. Alternative options to utilising these Protobuf plugins are: 1. Fork one of the above plugins and maintain it for our own purposes. -2. Perform validation on the model. This would be done either in the implementation of the use case - e.g. https://github.com/weaveworks/flintlock/blob/main/core/application/commands.go#L14, or the conversion from the request type to the model: e.g. https://github.com/weaveworks/flintlock/blob/main/infrastructure/grpc/server.go#L33. +2. Perform validation on the model. This would be done either in the implementation of the use case - e.g. https://github.com/weaveworks-liquidmetal/flintlock/blob/main/core/application/commands.go#L14, or the conversion from the request type to the model: e.g. https://github.com/weaveworks-liquidmetal/flintlock/blob/main/infrastructure/grpc/server.go#L33. - For this we could utilise the [go-playground/validator](https://github.com/go-playground/validator) project. ## Decision diff --git a/docs/adr/0005-network-device-name.md b/docs/adr/0005-network-device-name.md index f1a6f313..2ee2b0df 100644 --- a/docs/adr/0005-network-device-name.md +++ b/docs/adr/0005-network-device-name.md @@ -46,4 +46,4 @@ As a result, it is possible to leak resources, when the MicroVM deletion failed and we lost track of a network device status from MicroVMSpec. For that reason, [Resource cleanup ADR #90][issue-90] priority might be raised to higher priority. -[issue-90]: https://github.com/weaveworks/flintlock/issues/90 +[issue-90]: https://github.com/weaveworks-liquidmetal/flintlock/issues/90 diff --git a/docs/adr/0234-update-api.md b/docs/adr/0234-update-api.md index 0dd4c257..05528cff 100644 --- a/docs/adr/0234-update-api.md +++ b/docs/adr/0234-update-api.md @@ -4,7 +4,7 @@ * Date: 2021-11-08 * Authors: @jmickey * Deciders: @jmickey @richardcase @Callisto13 @yitsushi -* ADR Discussion: https://github.com/weaveworks/flintlock/discussions/234 +* ADR Discussion: https://github.com/weaveworks-liquidmetal/flintlock/discussions/234 ## Context diff --git a/docs/adr/0241-opinionated-api-changes.md b/docs/adr/0241-opinionated-api-changes.md index 432f4866..55bc8083 100644 --- a/docs/adr/0241-opinionated-api-changes.md +++ b/docs/adr/0241-opinionated-api-changes.md @@ -4,7 +4,7 @@ * Date: 2021-11-10 * Authors: @jmickey * Deciders: @jmickey @richardcase @Callisto13 @yitsushi -* ADR Discussion: https://github.com/weaveworks/flintlock/discussions/241 +* ADR Discussion: https://github.com/weaveworks-liquidmetal/flintlock/discussions/241 ## Context diff --git a/docs/adr/0246-linters.md b/docs/adr/0246-linters.md index b8f0fa8c..0d5babdf 100644 --- a/docs/adr/0246-linters.md +++ b/docs/adr/0246-linters.md @@ -33,10 +33,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) ``` @@ -205,4 +205,4 @@ process := exec.Command(options.Command, options.Args...) * Spell checker in comments with GB locale. No more `maintanence` or `color`. * Some of the rules are hard to keep in mind first. -Discussion: https://github.com/weaveworks/flintlock/discussions/246 +Discussion: https://github.com/weaveworks-liquidmetal/flintlock/discussions/246 diff --git a/docs/quick-start.md b/docs/quick-start.md index c251d0ad..c79f3b9a 100644 --- a/docs/quick-start.md +++ b/docs/quick-start.md @@ -290,7 +290,7 @@ cp build/cargo_target/${toolbox}/debug/{firecracker,jailer} ${TARGET} If you don't have to compile it yourself, you can download a pre-built version from the [Pre-requisities discussion][discussion-107]. -[discussion-107]: https://github.com/weaveworks/flintlock/discussions/107 +[discussion-107]: https://github.com/weaveworks-liquidmetal/flintlock/discussions/107 ## Set up and start flintlock diff --git a/docs/releasing.md b/docs/releasing.md index 56a7a92c..2e87d724 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -30,7 +30,7 @@ git tag -s "${RELEASE_VERSION}" -m "${RELEASE_VERSION}" git push origin "${RELEASE_VERSION}" ``` -* Check the [release](https://github.com/weaveworks/flintlock/actions/workflows/release.yml) GitHub Actions workflow completes successfully. +* Check the [release](https://github.com/weaveworks-liquidmetal/flintlock/actions/workflows/release.yml) GitHub Actions workflow completes successfully. This may take a few minutes as it runs the e2es as part of the process. ## Edit & Publish GitHub Release diff --git a/go.mod b/go.mod index 15266bf8..52e3bc81 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module github.com/weaveworks/flintlock +module github.com/weaveworks-liquidmetal/flintlock go 1.17 replace ( - github.com/weaveworks/flintlock/api => ./api - github.com/weaveworks/flintlock/client => ./client + github.com/weaveworks-liquidmetal/flintlock/api => ./api + github.com/weaveworks-liquidmetal/flintlock/client => ./client ) require ( @@ -43,8 +43,8 @@ require ( require ( github.com/gorilla/mux v1.8.0 github.com/urfave/cli/v2 v2.3.0 - github.com/weaveworks/flintlock/api v0.0.0-20211217111250-5f8d70c4a581 - github.com/weaveworks/flintlock/client v0.0.0-00010101000000-000000000000 + github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20211217111250-5f8d70c4a581 + github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-00010101000000-000000000000 github.com/yitsushi/file-tailor v1.0.0 sigs.k8s.io/yaml v1.3.0 ) diff --git a/hack/tools/go.mod b/hack/tools/go.mod index b7b6be00..ba634ca9 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/weaveworks/flintlock/hack/tools +module github.com/weaveworks-liquidmetal/flintlock/hack/tools go 1.17 diff --git a/infrastructure/containerd/content.go b/infrastructure/containerd/content.go index 78fd8de1..918f6474 100644 --- a/infrastructure/containerd/content.go +++ b/infrastructure/containerd/content.go @@ -3,8 +3,8 @@ package containerd import ( "fmt" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) const ( diff --git a/infrastructure/containerd/convert.go b/infrastructure/containerd/convert.go index 9342f343..65881661 100644 --- a/infrastructure/containerd/convert.go +++ b/infrastructure/containerd/convert.go @@ -6,9 +6,8 @@ import ( "github.com/containerd/containerd/events" "github.com/containerd/containerd/mount" "github.com/containerd/typeurl" - - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) func convertMountToModel(mountPoint mount.Mount, snapshotter string) (models.Mount, error) { diff --git a/infrastructure/containerd/event_service.go b/infrastructure/containerd/event_service.go index 8b29d0ea..a0e1428b 100644 --- a/infrastructure/containerd/event_service.go +++ b/infrastructure/containerd/event_service.go @@ -8,8 +8,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/events" "github.com/containerd/containerd/namespaces" - - "github.com/weaveworks/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) func NewEventService(cfg *Config) (ports.EventService, error) { diff --git a/infrastructure/containerd/event_service_test.go b/infrastructure/containerd/event_service_test.go index e87fda93..7e4d6a24 100644 --- a/infrastructure/containerd/event_service_test.go +++ b/infrastructure/containerd/event_service_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/api/events" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/containerd" + "github.com/weaveworks-liquidmetal/flintlock/api/events" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" ) const ( @@ -113,7 +113,6 @@ func newSubscriber(t *testing.T, rootContext context.Context, data subData) { Expect(err).To(BeNil()) Expect(recvd).To(HaveLen(data.MaxEvents)) - } func watch(subscriber *testSubscriber, maxEvents int) ([]interface{}, error) { diff --git a/infrastructure/containerd/image_service.go b/infrastructure/containerd/image_service.go index 1ad46895..3e5c1890 100644 --- a/infrastructure/containerd/image_service.go +++ b/infrastructure/containerd/image_service.go @@ -11,10 +11,9 @@ import ( "github.com/containerd/containerd/snapshots" "github.com/opencontainers/image-spec/identity" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) // NewImageService will create a new image service based on containerd with the supplied config. diff --git a/infrastructure/containerd/image_service_integration_test.go b/infrastructure/containerd/image_service_integration_test.go index c282e496..510fe395 100644 --- a/infrastructure/containerd/image_service_integration_test.go +++ b/infrastructure/containerd/image_service_integration_test.go @@ -11,9 +11,9 @@ import ( "github.com/containerd/containerd/snapshots" . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/containerd" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" ) const ( diff --git a/infrastructure/containerd/image_service_test.go b/infrastructure/containerd/image_service_test.go index 3bc0f2a3..96f1bf6e 100644 --- a/infrastructure/containerd/image_service_test.go +++ b/infrastructure/containerd/image_service_test.go @@ -9,10 +9,10 @@ import ( "github.com/golang/mock/gomock" g "github.com/onsi/gomega" "github.com/opencontainers/go-digest" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/containerd" - "github.com/weaveworks/flintlock/infrastructure/mock" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) const ( diff --git a/infrastructure/containerd/repo.go b/infrastructure/containerd/repo.go index 2143e2af..9a3a5b30 100644 --- a/infrastructure/containerd/repo.go +++ b/infrastructure/containerd/repo.go @@ -14,11 +14,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" - - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) // NewMicroVMRepo will create a new containerd backed microvm repository with the supplied containerd configuration. @@ -128,7 +127,11 @@ func (r *containerdRepo) Get(ctx context.Context, options ports.RepositoryGetOpt } if spec == nil { - return nil, errors.NewSpecNotFound(options.Name, options.Namespace, options.Version, options.UID) + return nil, errors.NewSpecNotFound( //nolint: wrapcheck // No need to wrap this error + options.Name, + options.Namespace, + options.Version, + options.UID) } return spec, nil diff --git a/infrastructure/containerd/repo_test.go b/infrastructure/containerd/repo_test.go index 57ac6179..f13212f5 100644 --- a/infrastructure/containerd/repo_test.go +++ b/infrastructure/containerd/repo_test.go @@ -5,9 +5,9 @@ import ( . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/containerd" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" ) func TestMicroVMRepo_Integration(t *testing.T) { diff --git a/infrastructure/controllers/microvm_controller.go b/infrastructure/controllers/microvm_controller.go index c6688477..6a36157f 100644 --- a/infrastructure/controllers/microvm_controller.go +++ b/infrastructure/controllers/microvm_controller.go @@ -8,13 +8,12 @@ import ( "time" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/api/events" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/queue" + "github.com/weaveworks-liquidmetal/flintlock/api/events" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/queue" ) func New(eventSvc ports.EventService, reconcileUC ports.ReconcileMicroVMsUseCase) *MicroVMController { diff --git a/infrastructure/controllers/microvm_controller_test.go b/infrastructure/controllers/microvm_controller_test.go index ab662489..cea4aaa7 100644 --- a/infrastructure/controllers/microvm_controller_test.go +++ b/infrastructure/controllers/microvm_controller_test.go @@ -12,13 +12,13 @@ import ( "github.com/sirupsen/logrus" lgrtest "github.com/sirupsen/logrus/hooks/test" - "github.com/weaveworks/flintlock/api/events" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/controllers" - "github.com/weaveworks/flintlock/infrastructure/mock" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/api/events" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/controllers" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) var ( diff --git a/infrastructure/firecracker/config.go b/infrastructure/firecracker/config.go index f29ed340..9ca09970 100644 --- a/infrastructure/firecracker/config.go +++ b/infrastructure/firecracker/config.go @@ -5,12 +5,11 @@ import ( "fmt" "github.com/firecracker-microvm/firecracker-go-sdk" + cinetwork "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/network" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/internal/config" "gopkg.in/yaml.v3" - - cinetwork "github.com/weaveworks/flintlock/client/cloudinit/network" - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/internal/config" ) const ( diff --git a/infrastructure/firecracker/create.go b/infrastructure/firecracker/create.go index 9e157b27..2ea25bb7 100644 --- a/infrastructure/firecracker/create.go +++ b/infrastructure/firecracker/create.go @@ -10,11 +10,10 @@ import ( "github.com/firecracker-microvm/firecracker-go-sdk" "github.com/sirupsen/logrus" "github.com/spf13/afero" - - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/process" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/process" ) // Create will create a new microvm. diff --git a/infrastructure/firecracker/provider.go b/infrastructure/firecracker/provider.go index 622d2842..1e8f1579 100644 --- a/infrastructure/firecracker/provider.go +++ b/infrastructure/firecracker/provider.go @@ -10,12 +10,11 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/afero" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/process" tailor "github.com/yitsushi/file-tailor" - - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/process" ) // Config represents the configuration options for the Firecracker infrastructure. diff --git a/infrastructure/firecracker/state.go b/infrastructure/firecracker/state.go index 6693a4eb..a0cfe056 100644 --- a/infrastructure/firecracker/state.go +++ b/infrastructure/firecracker/state.go @@ -10,9 +10,8 @@ import ( "strconv" "github.com/spf13/afero" - - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) type State interface { diff --git a/infrastructure/firecracker/types_test.go b/infrastructure/firecracker/types_test.go index 77ea87ff..8681ef1c 100644 --- a/infrastructure/firecracker/types_test.go +++ b/infrastructure/firecracker/types_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/weaveworks/flintlock/infrastructure/firecracker" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/firecracker" ) func TestUnmarshallWithFCSample(t *testing.T) { diff --git a/infrastructure/grpc/convert.go b/infrastructure/grpc/convert.go index 2fc21b66..1360cac2 100644 --- a/infrastructure/grpc/convert.go +++ b/infrastructure/grpc/convert.go @@ -3,11 +3,11 @@ package grpc import ( "fmt" - "github.com/weaveworks/flintlock/api/types" - "github.com/weaveworks/flintlock/client/cloudinit/instance" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/ptr" + "github.com/weaveworks-liquidmetal/flintlock/api/types" + "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/instance" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/ptr" ) func convertMicroVMToModel(spec *types.MicroVMSpec) (*models.MicroVM, error) { diff --git a/infrastructure/grpc/defaults.go b/infrastructure/grpc/defaults.go index 696d8f57..15ec3e47 100644 --- a/infrastructure/grpc/defaults.go +++ b/infrastructure/grpc/defaults.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) func newMetadataInterface() *models.NetworkInterface { diff --git a/infrastructure/grpc/server.go b/infrastructure/grpc/server.go index 5baabd83..2ecfd492 100644 --- a/infrastructure/grpc/server.go +++ b/infrastructure/grpc/server.go @@ -6,16 +6,15 @@ import ( "fmt" "github.com/go-playground/validator/v10" + mvmv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + "github.com/weaveworks-liquidmetal/flintlock/api/types" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/validation" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - - mvmv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - "github.com/weaveworks/flintlock/api/types" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" - "github.com/weaveworks/flintlock/pkg/validation" ) // NewServer creates a new server instance. diff --git a/infrastructure/grpc/server_test.go b/infrastructure/grpc/server_test.go index 64cd2d31..544fa41e 100644 --- a/infrastructure/grpc/server_test.go +++ b/infrastructure/grpc/server_test.go @@ -9,11 +9,11 @@ import ( . "github.com/onsi/gomega" grpcPkg "google.golang.org/grpc" - mvm1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - "github.com/weaveworks/flintlock/api/types" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/infrastructure/grpc" - "github.com/weaveworks/flintlock/infrastructure/mock" + mvm1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + "github.com/weaveworks-liquidmetal/flintlock/api/types" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/grpc" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func TestServer_CreateMicroVM(t *testing.T) { diff --git a/infrastructure/mock/containerd.go b/infrastructure/mock/containerd.go index 8ca4c3b8..48e13ee9 100644 --- a/infrastructure/mock/containerd.go +++ b/infrastructure/mock/containerd.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/weaveworks/flintlock/infrastructure/containerd (interfaces: Client) +// Source: github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd (interfaces: Client) // Package mock is a generated GoMock package. package mock diff --git a/infrastructure/mock/gen.go b/infrastructure/mock/gen.go index f55fb9fb..d21b69f2 100644 --- a/infrastructure/mock/gen.go +++ b/infrastructure/mock/gen.go @@ -1,7 +1,7 @@ package mock -//go:generate ../../hack/tools/bin/mockgen -destination ports.go -package mock github.com/weaveworks/flintlock/core/ports MicroVMService,MicroVMRepository,EventService,IDService,ImageService,ReconcileMicroVMsUseCase,NetworkService,MicroVMCommandUseCases,MicroVMQueryUseCases -//go:generate ../../hack/tools/bin/mockgen -destination containerd.go -package mock github.com/weaveworks/flintlock/infrastructure/containerd Client +//go:generate ../../hack/tools/bin/mockgen -destination ports.go -package mock github.com/weaveworks-liquidmetal/flintlock/core/ports MicroVMService,MicroVMRepository,EventService,IDService,ImageService,ReconcileMicroVMsUseCase,NetworkService,MicroVMCommandUseCases,MicroVMQueryUseCases +//go:generate ../../hack/tools/bin/mockgen -destination containerd.go -package mock github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd Client //go:generate ../../hack/tools/bin/mockgen -destination ext_containerd_leases.go -package mock github.com/containerd/containerd/leases Manager //go:generate ../../hack/tools/bin/mockgen -destination ext_containerd_snapshots.go -package mock github.com/containerd/containerd/snapshots Snapshotter //go:generate ../../hack/tools/bin/mockgen -destination ext_containerd.go -package mock github.com/containerd/containerd Image diff --git a/infrastructure/mock/ports.go b/infrastructure/mock/ports.go index e91b2ddf..35d619bf 100644 --- a/infrastructure/mock/ports.go +++ b/infrastructure/mock/ports.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/weaveworks/flintlock/core/ports (interfaces: MicroVMService,MicroVMRepository,EventService,IDService,ImageService,ReconcileMicroVMsUseCase,NetworkService,MicroVMCommandUseCases,MicroVMQueryUseCases) +// Source: github.com/weaveworks-liquidmetal/flintlock/core/ports (interfaces: MicroVMService,MicroVMRepository,EventService,IDService,ImageService,ReconcileMicroVMsUseCase,NetworkService,MicroVMCommandUseCases,MicroVMQueryUseCases) // Package mock is a generated GoMock package. package mock @@ -9,8 +9,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - models "github.com/weaveworks/flintlock/core/models" - ports "github.com/weaveworks/flintlock/core/ports" + models "github.com/weaveworks-liquidmetal/flintlock/core/models" + ports "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) // MockMicroVMService is a mock of MicroVMService interface. diff --git a/infrastructure/network/network_service.go b/infrastructure/network/network_service.go index 42bf58ef..231a6183 100644 --- a/infrastructure/network/network_service.go +++ b/infrastructure/network/network_service.go @@ -9,11 +9,10 @@ import ( "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - - "github.com/weaveworks/flintlock/core/errors" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/core/errors" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) type Config struct { diff --git a/infrastructure/network/utils.go b/infrastructure/network/utils.go index fe512fa3..ef01453c 100644 --- a/infrastructure/network/utils.go +++ b/infrastructure/network/utils.go @@ -8,8 +8,7 @@ import ( "strings" "github.com/vishvananda/netlink" - - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) const ( diff --git a/infrastructure/network/utils_test.go b/infrastructure/network/utils_test.go index 45bc78cf..b8a24e45 100644 --- a/infrastructure/network/utils_test.go +++ b/infrastructure/network/utils_test.go @@ -5,8 +5,8 @@ import ( g "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/infrastructure/network" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/network" ) const fancyNewIfaceType models.IfaceType = "rainbow" diff --git a/infrastructure/ulid/ulid.go b/infrastructure/ulid/ulid.go index cbad3d4f..a9490a27 100644 --- a/infrastructure/ulid/ulid.go +++ b/infrastructure/ulid/ulid.go @@ -6,8 +6,7 @@ import ( "time" "github.com/oklog/ulid" - - "github.com/weaveworks/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) func randomSource() *rand.Rand { diff --git a/internal/command/flags/flags.go b/internal/command/flags/flags.go index 4f55bc7f..9e0fd9e8 100644 --- a/internal/command/flags/flags.go +++ b/internal/command/flags/flags.go @@ -4,9 +4,8 @@ import ( "fmt" "github.com/spf13/cobra" - - "github.com/weaveworks/flintlock/internal/config" - "github.com/weaveworks/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) const ( diff --git a/internal/command/flags/urfave.go b/internal/command/flags/urfave.go index d76f639a..e6999079 100644 --- a/internal/command/flags/urfave.go +++ b/internal/command/flags/urfave.go @@ -2,9 +2,8 @@ package flags import ( "github.com/urfave/cli/v2" - - "github.com/weaveworks/flintlock/internal/config" - "github.com/weaveworks/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) type WithFlagsFunc func() []cli.Flag diff --git a/internal/command/gw/gw.go b/internal/command/gw/gw.go index 6783f14d..4c2948ad 100644 --- a/internal/command/gw/gw.go +++ b/internal/command/gw/gw.go @@ -10,15 +10,14 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/spf13/cobra" + mvmv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + cmdflags "github.com/weaveworks-liquidmetal/flintlock/internal/command/flags" + "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/weaveworks-liquidmetal/flintlock/internal/version" + "github.com/weaveworks-liquidmetal/flintlock/pkg/flags" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - - mvmv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - cmdflags "github.com/weaveworks/flintlock/internal/command/flags" - "github.com/weaveworks/flintlock/internal/config" - "github.com/weaveworks/flintlock/internal/version" - "github.com/weaveworks/flintlock/pkg/flags" - "github.com/weaveworks/flintlock/pkg/log" ) // NewCommand creates a new cobra command for running the gRPC HTTP gateway. diff --git a/internal/command/metrics/serve.go b/internal/command/metrics/serve.go index 5c81166d..a6180b5d 100644 --- a/internal/command/metrics/serve.go +++ b/internal/command/metrics/serve.go @@ -8,12 +8,11 @@ import ( "github.com/gorilla/mux" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" - - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/internal/command/flags" - "github.com/weaveworks/flintlock/internal/config" - "github.com/weaveworks/flintlock/internal/inject" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/internal/command/flags" + "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/weaveworks-liquidmetal/flintlock/internal/inject" ) type serveFunc func(http.ResponseWriter, *http.Request) diff --git a/internal/command/root.go b/internal/command/root.go index 9ca62a3e..8c1e873e 100644 --- a/internal/command/root.go +++ b/internal/command/root.go @@ -6,14 +6,13 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - - "github.com/weaveworks/flintlock/internal/command/gw" - "github.com/weaveworks/flintlock/internal/command/run" - "github.com/weaveworks/flintlock/internal/config" - "github.com/weaveworks/flintlock/internal/version" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/flags" - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/internal/command/gw" + "github.com/weaveworks-liquidmetal/flintlock/internal/command/run" + "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/weaveworks-liquidmetal/flintlock/internal/version" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/flags" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) func NewRootCommand() (*cobra.Command, error) { diff --git a/internal/command/run/run.go b/internal/command/run/run.go index 6e036349..8d443a91 100644 --- a/internal/command/run/run.go +++ b/internal/command/run/run.go @@ -12,17 +12,16 @@ import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/cobra" + mvmv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + cmdflags "github.com/weaveworks-liquidmetal/flintlock/internal/command/flags" + "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/weaveworks-liquidmetal/flintlock/internal/inject" + "github.com/weaveworks-liquidmetal/flintlock/internal/version" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/pkg/flags" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" "google.golang.org/grpc" "google.golang.org/grpc/reflection" - - mvmv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - cmdflags "github.com/weaveworks/flintlock/internal/command/flags" - "github.com/weaveworks/flintlock/internal/config" - "github.com/weaveworks/flintlock/internal/inject" - "github.com/weaveworks/flintlock/internal/version" - "github.com/weaveworks/flintlock/pkg/defaults" - "github.com/weaveworks/flintlock/pkg/flags" - "github.com/weaveworks/flintlock/pkg/log" ) // NewCommand creates a new cobra command for running flintlock. diff --git a/internal/config/config.go b/internal/config/config.go index 02d195dc..6bcbd274 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) // Config represents the flintlockd configuration. diff --git a/internal/inject/wire.go b/internal/inject/wire.go index 26e61862..8d5761ca 100644 --- a/internal/inject/wire.go +++ b/internal/inject/wire.go @@ -10,16 +10,16 @@ import ( "github.com/google/wire" "github.com/spf13/afero" - "github.com/weaveworks/flintlock/core/application" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/containerd" - "github.com/weaveworks/flintlock/infrastructure/controllers" - "github.com/weaveworks/flintlock/infrastructure/firecracker" - microvmgrpc "github.com/weaveworks/flintlock/infrastructure/grpc" - "github.com/weaveworks/flintlock/infrastructure/network" - "github.com/weaveworks/flintlock/infrastructure/ulid" - "github.com/weaveworks/flintlock/internal/config" - "github.com/weaveworks/flintlock/pkg/defaults" + "github.com/weaveworks-liquidmetal/flintlock/core/application" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/controllers" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/firecracker" + microvmgrpc "github.com/weaveworks-liquidmetal/flintlock/infrastructure/grpc" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/network" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/ulid" + "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) func InitializePorts(cfg *config.Config) (*ports.Collection, error) { diff --git a/internal/inject/wire_gen.go b/internal/inject/wire_gen.go index 4e47d7c7..00bb9da6 100644 --- a/internal/inject/wire_gen.go +++ b/internal/inject/wire_gen.go @@ -8,18 +8,19 @@ package inject import ( "fmt" - "github.com/spf13/afero" - "github.com/weaveworks/flintlock/core/application" - "github.com/weaveworks/flintlock/core/ports" - "github.com/weaveworks/flintlock/infrastructure/containerd" - "github.com/weaveworks/flintlock/infrastructure/controllers" - "github.com/weaveworks/flintlock/infrastructure/firecracker" - "github.com/weaveworks/flintlock/infrastructure/grpc" - "github.com/weaveworks/flintlock/infrastructure/network" - "github.com/weaveworks/flintlock/infrastructure/ulid" - "github.com/weaveworks/flintlock/internal/config" - "github.com/weaveworks/flintlock/pkg/defaults" "time" + + "github.com/spf13/afero" + "github.com/weaveworks-liquidmetal/flintlock/core/application" + "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/controllers" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/firecracker" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/grpc" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/network" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/ulid" + "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) // Injectors from wire.go: diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go index 09e16cb1..98aa7065 100644 --- a/pkg/log/log_test.go +++ b/pkg/log/log_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/gomega" "github.com/sirupsen/logrus" - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) func TestLogger_Configure(t *testing.T) { diff --git a/pkg/planner/actuator.go b/pkg/planner/actuator.go index bef5530e..ed3c8d03 100644 --- a/pkg/planner/actuator.go +++ b/pkg/planner/actuator.go @@ -6,8 +6,7 @@ import ( "time" "github.com/sirupsen/logrus" - - "github.com/weaveworks/flintlock/pkg/log" + "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) // Actuator will execute the given plan. diff --git a/pkg/planner/actuator_test.go b/pkg/planner/actuator_test.go index 960099c2..2e8ba804 100644 --- a/pkg/planner/actuator_test.go +++ b/pkg/planner/actuator_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/models" - "github.com/weaveworks/flintlock/infrastructure/ulid" - "github.com/weaveworks/flintlock/pkg/planner" + "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/infrastructure/ulid" + "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func TestActuator_SingleProc(t *testing.T) { diff --git a/pkg/planner/planner.go b/pkg/planner/planner.go index 5cda4dca..50506893 100644 --- a/pkg/planner/planner.go +++ b/pkg/planner/planner.go @@ -3,7 +3,7 @@ package planner import ( "context" - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) // NOTE: this is based on this prior work https://gianarb.it/blog/reactive-plan-golang-example diff --git a/pkg/process/process_test.go b/pkg/process/process_test.go index c02f3477..027b4e28 100644 --- a/pkg/process/process_test.go +++ b/pkg/process/process_test.go @@ -8,26 +8,26 @@ import ( "time" g "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/pkg/process" + "github.com/weaveworks-liquidmetal/flintlock/pkg/process" ) func TestSendSignal(t *testing.T) { g.RegisterTestingT(t) - //create a new process + // create a new process p := exec.Command("sleep", "10") - //start the process + // start the process err := p.Start() g.Expect(err).NotTo(g.HaveOccurred()) err = process.SendSignal(p.Process.Pid, os.Kill) g.Expect(err).NotTo(g.HaveOccurred()) - //release the pid + // release the pid p.Wait() - //check if process exists + // check if process exists exists, err := process.Exists(p.Process.Pid) g.Expect(err).NotTo(g.HaveOccurred()) g.Expect(exists).To(g.BeFalse()) @@ -60,7 +60,7 @@ func TestWaitWithContext(t *testing.T) { err := p.Start() g.Expect(err).NotTo(g.HaveOccurred()) - //wait on the process + // wait on the process ctx, cancel := context.WithTimeout(context.Background(), time.Duration(tc.timeout)*time.Second) defer cancel() @@ -69,7 +69,7 @@ func TestWaitWithContext(t *testing.T) { err = process.WaitWithContext(ctx, p.Process.Pid) g.Expect(err).NotTo(g.HaveOccurred()) - //check if process exists + // check if process exists exists, err := process.Exists(p.Process.Pid) g.Expect(err).NotTo(g.HaveOccurred()) g.Expect(exists).To(g.BeFalse()) diff --git a/pkg/queue/queue_test.go b/pkg/queue/queue_test.go index 43e57d20..86fb9a5a 100644 --- a/pkg/queue/queue_test.go +++ b/pkg/queue/queue_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/weaveworks/flintlock/pkg/queue" + "github.com/weaveworks-liquidmetal/flintlock/pkg/queue" ) func TestSimpleSyncQueue_Basic(t *testing.T) { diff --git a/pkg/validation/validate.go b/pkg/validation/validate.go index e1536fd9..7ca9fdbf 100644 --- a/pkg/validation/validate.go +++ b/pkg/validation/validate.go @@ -7,8 +7,7 @@ import ( "github.com/containerd/containerd/reference" playgroundValidator "github.com/go-playground/validator/v10" - - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) type Validator interface { diff --git a/pkg/validation/validate_test.go b/pkg/validation/validate_test.go index b1cd9d3b..d2aca5a7 100644 --- a/pkg/validation/validate_test.go +++ b/pkg/validation/validate_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-playground/validator/v10" . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/core/models" + "github.com/weaveworks-liquidmetal/flintlock/core/models" ) func TestValidation_Valid(t *testing.T) { diff --git a/pkg/wait/wait_test.go b/pkg/wait/wait_test.go index 73253799..0bcec138 100644 --- a/pkg/wait/wait_test.go +++ b/pkg/wait/wait_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/weaveworks/flintlock/pkg/wait" + "github.com/weaveworks-liquidmetal/flintlock/pkg/wait" ) func TestConditionMet(t *testing.T) { diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index e93c8669..23e6f1d0 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -9,9 +9,9 @@ import ( "testing" . "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/api/types" - "github.com/weaveworks/flintlock/pkg/ptr" - u "github.com/weaveworks/flintlock/test/e2e/utils" + "github.com/weaveworks-liquidmetal/flintlock/api/types" + "github.com/weaveworks-liquidmetal/flintlock/pkg/ptr" + u "github.com/weaveworks-liquidmetal/flintlock/test/e2e/utils" ) var params *u.Params diff --git a/test/e2e/utils/runner.go b/test/e2e/utils/runner.go index 58ffa3e0..5e684430 100644 --- a/test/e2e/utils/runner.go +++ b/test/e2e/utils/runner.go @@ -19,12 +19,12 @@ import ( "github.com/pelletier/go-toml" "google.golang.org/grpc" - "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" + "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" ) const ( containerdBin = "containerd" - flintlockCmdDir = "github.com/weaveworks/flintlock/cmd/flintlockd" + flintlockCmdDir = "github.com/weaveworks-liquidmetal/flintlock/cmd/flintlockd" containerdCfgDir = "/etc/containerd" containerdRootDir = "/var/lib/containerd-e2e" containerdStateDir = "/run/containerd-e2e" diff --git a/test/e2e/utils/utils.go b/test/e2e/utils/utils.go index 5243620c..c4c53969 100644 --- a/test/e2e/utils/utils.go +++ b/test/e2e/utils/utils.go @@ -11,8 +11,8 @@ import ( g "github.com/onsi/gomega" - "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - "github.com/weaveworks/flintlock/api/types" + "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + "github.com/weaveworks-liquidmetal/flintlock/api/types" ) func CreateMVM(client v1alpha1.MicroVMClient, name, ns string) *v1alpha1.CreateMicroVMResponse { diff --git a/userdocs/blog/2021-11-02-v0.1.0-alpha.1.md b/userdocs/blog/2021-11-02-v0.1.0-alpha.1.md index 05a430fb..d3aca1c7 100644 --- a/userdocs/blog/2021-11-02-v0.1.0-alpha.1.md +++ b/userdocs/blog/2021-11-02-v0.1.0-alpha.1.md @@ -7,15 +7,15 @@ tags: [release, announcement] # v0.1.0-alpha.1 -🚨 **This is an ALPHA RELEASE and as such it may be hard to run. Please only use it for testing purposes. If you find any bugs or want to suggest features, then file an [issue](https://github.com/weaveworks/flintlock/issues/new/choose).** +🚨 **This is an ALPHA RELEASE and as such it may be hard to run. Please only use it for testing purposes. If you find any bugs or want to suggest features, then file an [issue](https://github.com/weaveworks-liquidmetal/flintlock/issues/new/choose).** ## New Contributors -* [@richardcase][richardcase] made their first contribution in https://github.com/weaveworks/flintlock/pull/21 -* [@yitsushi][yitsushi] made their first contribution in https://github.com/weaveworks/flintlock/pull/104 -* [@jmickey][jmickey] made their first contribution in https://github.com/weaveworks/flintlock/pull/123 -* [@Callisto13][Callisto13] made their first contribution in https://github.com/weaveworks/flintlock/pull/143 -* [@stoovon][stoovon] made their first contribution in https://github.com/weaveworks/flintlock/pull/164 +* [@richardcase][richardcase] made their first contribution in https://github.com/weaveworks-liquidmetal/flintlock/pull/21 +* [@yitsushi][yitsushi] made their first contribution in https://github.com/weaveworks-liquidmetal/flintlock/pull/104 +* [@jmickey][jmickey] made their first contribution in https://github.com/weaveworks-liquidmetal/flintlock/pull/123 +* [@Callisto13][Callisto13] made their first contribution in https://github.com/weaveworks-liquidmetal/flintlock/pull/143 +* [@stoovon][stoovon] made their first contribution in https://github.com/weaveworks-liquidmetal/flintlock/pull/164 [richardcase]: https://github.com/richardcase [yitsushi]: https://github.com/yitsushi @@ -29,71 +29,71 @@ tags: [release, announcement] ### 🚀 Enhancements -* chore: initial repo setup by @richardcase in https://github.com/weaveworks/flintlock/pull/21 -* test: added terratest based e2e testing by @richardcase in https://github.com/weaveworks/flintlock/pull/22 -* feat: initial project setup and provider interface definition by @richardcase in https://github.com/weaveworks/flintlock/pull/23 -* feat: added microvm spec & repository by @richardcase in https://github.com/weaveworks/flintlock/pull/34 -* feat: replace zap with logrus by @richardcase in https://github.com/weaveworks/flintlock/pull/36 -* feat: added skeleton firecracker provider by @richardcase in https://github.com/weaveworks/flintlock/pull/39 -* feat: added reactive planning package by @richardcase in https://github.com/weaveworks/flintlock/pull/40 -* feat: added grpc service definition and unimplemented server by @richardcase in https://github.com/weaveworks/flintlock/pull/41 -* feat: event bus implementation by @richardcase in https://github.com/weaveworks/flintlock/pull/45 -* chore: added kind/refactor as allowed PR type by @richardcase in https://github.com/weaveworks/flintlock/pull/55 -* feat: added events and refactored to ports/adapters architecture by @richardcase in https://github.com/weaveworks/flintlock/pull/57 -* feat: image service implementation by @richardcase in https://github.com/weaveworks/flintlock/pull/59 -* feat: added containerd based event services by @richardcase in https://github.com/weaveworks/flintlock/pull/63 -* feat: add control loop framework for microvm reconciliation by @richardcase in https://github.com/weaveworks/flintlock/pull/75 -* chore: added test coverage and upload codecov by @richardcase in https://github.com/weaveworks/flintlock/pull/79 -* feat: added stale issue/pr GHA workflow by @richardcase in https://github.com/weaveworks/flintlock/pull/87 -* chore: updated dependencies by @richardcase in https://github.com/weaveworks/flintlock/pull/99 -* feat: initial implementation of microvm create by @richardcase in https://github.com/weaveworks/flintlock/pull/98 -* chore: add labels to dependabot PRs by @richardcase in https://github.com/weaveworks/flintlock/pull/119 -* Initial release process by @richardcase in https://github.com/weaveworks/flintlock/pull/121 -* feat: Mark the VM as deleted by @yitsushi in https://github.com/weaveworks/flintlock/pull/124 -* Delete MicroVM by @yitsushi in https://github.com/weaveworks/flintlock/pull/144 -* feat: add model spec validation by @jmickey in https://github.com/weaveworks/flintlock/pull/147 -* Kill Firecracker if SendCtrlAltDel failed by @yitsushi in https://github.com/weaveworks/flintlock/pull/177 -* feat: implement query methods and add status to query api by @jmickey in https://github.com/weaveworks/flintlock/pull/173 +* chore: initial repo setup by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/21 +* test: added terratest based e2e testing by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/22 +* feat: initial project setup and provider interface definition by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/23 +* feat: added microvm spec & repository by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/34 +* feat: replace zap with logrus by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/36 +* feat: added skeleton firecracker provider by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/39 +* feat: added reactive planning package by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/40 +* feat: added grpc service definition and unimplemented server by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/41 +* feat: event bus implementation by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/45 +* chore: added kind/refactor as allowed PR type by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/55 +* feat: added events and refactored to ports/adapters architecture by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/57 +* feat: image service implementation by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/59 +* feat: added containerd based event services by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/63 +* feat: add control loop framework for microvm reconciliation by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/75 +* chore: added test coverage and upload codecov by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/79 +* feat: added stale issue/pr GHA workflow by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/87 +* chore: updated dependencies by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/99 +* feat: initial implementation of microvm create by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/98 +* chore: add labels to dependabot PRs by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/119 +* Initial release process by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/121 +* feat: Mark the VM as deleted by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/124 +* Delete MicroVM by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/144 +* feat: add model spec validation by @jmickey in https://github.com/weaveworks-liquidmetal/flintlock/pull/147 +* Kill Firecracker if SendCtrlAltDel failed by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/177 +* feat: implement query methods and add status to query api by @jmickey in https://github.com/weaveworks-liquidmetal/flintlock/pull/173 ### 🐛 Bugs -* fix: titlecheck action fails by @richardcase in https://github.com/weaveworks/flintlock/pull/116 -* fix infrastructure/containerd integration tests by @yitsushi in https://github.com/weaveworks/flintlock/pull/120 -* Fix go generate by @yitsushi in https://github.com/weaveworks/flintlock/pull/126 -* fix: dhcp not working for macvtap by @richardcase in https://github.com/weaveworks/flintlock/pull/129 -* fix: check instance state before starting by @richardcase in https://github.com/weaveworks/flintlock/pull/131 -* ci: ensure nightly builds actually runs by @Callisto13 in https://github.com/weaveworks/flintlock/pull/143 -* Try to fix EventService test failures by @yitsushi in https://github.com/weaveworks/flintlock/pull/154 -* Introduce a computed status of a microvm by @richardcase in https://github.com/weaveworks/flintlock/pull/150 -* chore: update vagrantfile to forward vm port to access grpc api & fix validations by @jmickey in https://github.com/weaveworks/flintlock/pull/170 -* Fix nil pointer dereference on CreateVM by @yitsushi in https://github.com/weaveworks/flintlock/pull/176 -* fix: incorrect binary name in release by @richardcase in https://github.com/weaveworks/flintlock/pull/188 +* fix: titlecheck action fails by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/116 +* fix infrastructure/containerd integration tests by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/120 +* Fix go generate by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/126 +* fix: dhcp not working for macvtap by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/129 +* fix: check instance state before starting by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/131 +* ci: ensure nightly builds actually runs by @Callisto13 in https://github.com/weaveworks-liquidmetal/flintlock/pull/143 +* Try to fix EventService test failures by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/154 +* Introduce a computed status of a microvm by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/150 +* chore: update vagrantfile to forward vm port to access grpc api & fix validations by @jmickey in https://github.com/weaveworks-liquidmetal/flintlock/pull/170 +* Fix nil pointer dereference on CreateVM by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/176 +* fix: incorrect binary name in release by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/188 ### 📖 Docs -* docs: quickstart guide by @yitsushi in https://github.com/weaveworks/flintlock/pull/104 -* chore: add vagrant configuration with complete dev environment by @jmickey in https://github.com/weaveworks/flintlock/pull/123 -* docs: basic structure for README.md and CONTRIBUTING.md by @yitsushi in https://github.com/weaveworks/flintlock/pull/112 -* docs: add ADR for microvm spec validation by @jmickey in https://github.com/weaveworks/flintlock/pull/141 -* docs: image creation docs by @richardcase in https://github.com/weaveworks/flintlock/pull/140 -* Document how to set up networking with wireless adapter by @yitsushi in https://github.com/weaveworks/flintlock/pull/135 -* [docs]: Minor additions to quickstart docs by @Callisto13 in https://github.com/weaveworks/flintlock/pull/153 -* Correct link for gRPCurl by @Callisto13 in https://github.com/weaveworks/flintlock/pull/165 -* docs: add ADR for merge of plan for create and update reconciliation operations by @jmickey in https://github.com/weaveworks/flintlock/pull/182 -* docs: update statuses for accepted adrs by @jmickey in https://github.com/weaveworks/flintlock/pull/185 -* Update maintainers by @Callisto13 in https://github.com/weaveworks/flintlock/pull/186 +* docs: quickstart guide by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/104 +* chore: add vagrant configuration with complete dev environment by @jmickey in https://github.com/weaveworks-liquidmetal/flintlock/pull/123 +* docs: basic structure for README.md and CONTRIBUTING.md by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/112 +* docs: add ADR for microvm spec validation by @jmickey in https://github.com/weaveworks-liquidmetal/flintlock/pull/141 +* docs: image creation docs by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/140 +* Document how to set up networking with wireless adapter by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/135 +* [docs]: Minor additions to quickstart docs by @Callisto13 in https://github.com/weaveworks-liquidmetal/flintlock/pull/153 +* Correct link for gRPCurl by @Callisto13 in https://github.com/weaveworks-liquidmetal/flintlock/pull/165 +* docs: add ADR for merge of plan for create and update reconciliation operations by @jmickey in https://github.com/weaveworks-liquidmetal/flintlock/pull/182 +* docs: update statuses for accepted adrs by @jmickey in https://github.com/weaveworks-liquidmetal/flintlock/pull/185 +* Update maintainers by @Callisto13 in https://github.com/weaveworks-liquidmetal/flintlock/pull/186 ### Other Changes -* refactor: split http gateway into seperate command by @richardcase in https://github.com/weaveworks/flintlock/pull/54 -* refactor: removed k8s api definitions and updates deps by @richardcase in https://github.com/weaveworks/flintlock/pull/56 -* chore: remove title check action by @richardcase in https://github.com/weaveworks/flintlock/pull/118 -* chore: add kvm install and config to vagrantfile by @jmickey in https://github.com/weaveworks/flintlock/pull/133 -* chore: dependency updates 2020-10-12 by @richardcase in https://github.com/weaveworks/flintlock/pull/136 -* chore: repo rename! reignite -> flintlock by @jmickey in https://github.com/weaveworks/flintlock/pull/158 -* Add steps/network tests by @yitsushi in https://github.com/weaveworks/flintlock/pull/157 -* refactor: changing api to be its own package by @richardcase in https://github.com/weaveworks/flintlock/pull/162 -* Full test on core/steps by @yitsushi in https://github.com/weaveworks/flintlock/pull/172 -* kind/feature: Bump build to Go 1.17 by @stoovon in https://github.com/weaveworks/flintlock/pull/164 - -**Full Changelog**: https://github.com/weaveworks/flintlock/commits/v0.1.0-alpha.1 +* refactor: split http gateway into seperate command by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/54 +* refactor: removed k8s api definitions and updates deps by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/56 +* chore: remove title check action by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/118 +* chore: add kvm install and config to vagrantfile by @jmickey in https://github.com/weaveworks-liquidmetal/flintlock/pull/133 +* chore: dependency updates 2020-10-12 by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/136 +* chore: repo rename! reignite -> flintlock by @jmickey in https://github.com/weaveworks-liquidmetal/flintlock/pull/158 +* Add steps/network tests by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/157 +* refactor: changing api to be its own package by @richardcase in https://github.com/weaveworks-liquidmetal/flintlock/pull/162 +* Full test on core/steps by @yitsushi in https://github.com/weaveworks-liquidmetal/flintlock/pull/172 +* kind/feature: Bump build to Go 1.17 by @stoovon in https://github.com/weaveworks-liquidmetal/flintlock/pull/164 + +**Full Changelog**: https://github.com/weaveworks-liquidmetal/flintlock/commits/v0.1.0-alpha.1 diff --git a/userdocs/docs/getting-started/basics/interacting-with-the-service.md b/userdocs/docs/getting-started/basics/interacting-with-the-service.md index 4382d16a..c8109f5c 100644 --- a/userdocs/docs/getting-started/basics/interacting-with-the-service.md +++ b/userdocs/docs/getting-started/basics/interacting-with-the-service.md @@ -59,6 +59,6 @@ implemented at present.** [grpcurl]: https://github.com/fullstorydev/grpcurl [bloomrpc]: https://github.com/uw-labs/bloomrpc -[payload-example-send]: https://github.com/weaveworks/flintlock/blob/main/hack/scripts/send.sh -[payload-example-create]: https://github.com/weaveworks/flintlock/blob/main/hack/scripts/payload/CreateMicroVM.json -[payload-example-delete]: https://github.com/weaveworks/flintlock/blob/main/hack/scripts/payload/DeleteMicroVM.json +[payload-example-send]: https://github.com/weaveworks-liquidmetal/flintlock/blob/main/hack/scripts/send.sh +[payload-example-create]: https://github.com/weaveworks-liquidmetal/flintlock/blob/main/hack/scripts/payload/CreateMicroVM.json +[payload-example-delete]: https://github.com/weaveworks-liquidmetal/flintlock/blob/main/hack/scripts/payload/DeleteMicroVM.json diff --git a/userdocs/docs/getting-started/basics/set-up-firecracker.md b/userdocs/docs/getting-started/basics/set-up-firecracker.md index 068b2dbd..acb4e66c 100644 --- a/userdocs/docs/getting-started/basics/set-up-firecracker.md +++ b/userdocs/docs/getting-started/basics/set-up-firecracker.md @@ -24,4 +24,4 @@ cp build/cargo_target/${toolbox}/debug/{firecracker,jailer} ${TARGET} If you don't have to compile it yourself, you can download a pre-built version from the [Pre-requisities discussion][discussion-107]. -[discussion-107]: https://github.com/weaveworks/flintlock/discussions/107 +[discussion-107]: https://github.com/weaveworks-liquidmetal/flintlock/discussions/107 diff --git a/userdocs/docusaurus.config.js b/userdocs/docusaurus.config.js index 34beef6a..50b7f36c 100644 --- a/userdocs/docusaurus.config.js +++ b/userdocs/docusaurus.config.js @@ -25,13 +25,13 @@ const config = { docs: { sidebarPath: require.resolve('./sidebars.js'), // Please change this to your repo. - editUrl: 'https://github.com/weaveworks/flintlock/edit/main/userdocs/', + editUrl: 'https://github.com/weaveworks-liquidmetal/flintlock/edit/main/userdocs/', }, blog: { showReadingTime: true, // Please change this to your repo. editUrl: - 'https://github.com/weaveworks/flintlock/edit/main/userdocs/blog/', + 'https://github.com/weaveworks-liquidmetal/flintlock/edit/main/userdocs/blog/', }, theme: { customCss: require.resolve('./src/css/custom.css'), @@ -64,7 +64,7 @@ const config = { }, {to: '/blog', label: 'Blog', position: 'left'}, { - href: 'https://github.com/weaveworks/flintlock', + href: 'https://github.com/weaveworks-liquidmetal/flintlock', label: 'GitHub', position: 'right', }, @@ -108,7 +108,7 @@ const config = { }, { label: 'GitHub', - href: 'https://github.com/weaveworks/flintlock', + href: 'https://github.com/weaveworks-liquidmetal/flintlock', }, ], },