From 93af147ed819d8bb97fbffdd1c6f10298d0200f9 Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Sat, 8 Jan 2022 10:00:37 +1100 Subject: [PATCH] Gearing up for namespace change (#361) * Gearing up for namespace change * gofmt diff compliance checks * clean up build tags * Adjust build tags * remove drupal8 example test * first attempt at fixing drupal tests * more ci changes * remove drupal9 elastic test - it broken * adjust lando test * adjust lando url reference * also prune volumes Signed-off-by: Karl Hepworth --- .github/workflows/goreleaser.yml | 4 +- .github/workflows/pygmy.yml | 66 +++++++++++++++++------------ .gitignore | 3 +- .goreleaser.yml | 6 +-- Dockerfile | 34 +++++++-------- README.md | 15 +++---- cmd/addkey.go | 4 +- cmd/clean.go | 3 +- cmd/down.go | 2 +- cmd/export.go | 6 ++- cmd/pull.go | 2 +- cmd/restart.go | 3 +- cmd/root.go | 3 +- cmd/status.go | 2 +- cmd/up.go | 3 +- cmd/update.go | 2 +- cmd/version.go | 2 +- docs/installation.md | 6 +-- go.mod | 2 +- main.go | 4 +- main_test.go | 2 +- service/dnsmasq/dnsmasq.go | 2 +- service/dnsmasq/dnsmasq_test.go | 4 +- service/endpoint/endpoint_test.go | 2 +- service/haproxy/haproxy.go | 2 +- service/haproxy/haproxy_test.go | 4 +- service/interface/docker/docker.go | 2 +- service/interface/interface.go | 5 ++- service/library/clean.go | 5 ++- service/library/library.go | 5 ++- service/library/network.go | 2 +- service/library/setup.go | 19 +++++---- service/library/sshkeyadd.go | 2 +- service/library/status.go | 11 ++--- service/library/up.go | 9 ++-- service/library/update.go | 2 +- service/mailhog/mailhog.go | 2 +- service/mailhog/mailhog_test.go | 4 +- service/network/network_test.go | 2 +- service/resolv/resolv.go | 6 ++- service/resolv/resolvWin.go | 3 +- service/ssh/agent/ssh_agent.go | 2 +- service/ssh/agent/ssh_agent_test.go | 4 +- service/ssh/key/ssh_addkey.go | 6 ++- service/ssh/key/ssh_addkey_test.go | 2 +- service/ssh/key/ssh_addkey_win.go | 3 +- 46 files changed, 157 insertions(+), 127 deletions(-) diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 41cde960..daf7a144 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -3,10 +3,12 @@ name: goreleaser on: push: branches: - - 'main' + - main tags: - 'v*' pull_request: + branches: + - main jobs: goreleaser: diff --git a/.github/workflows/pygmy.yml b/.github/workflows/pygmy.yml index f5392723..71bd7413 100644 --- a/.github/workflows/pygmy.yml +++ b/.github/workflows/pygmy.yml @@ -2,7 +2,16 @@ name: pygmy on: push: + branches: + - main pull_request: + branches: + - main + release: + types: + - created + schedule: + - cron: "0 0 * * *" jobs: basic: @@ -133,20 +142,6 @@ jobs: - name: Clone the official examples run: | git clone --recurse-submodules https://github.com/uselagoon/lagoon-examples.git - git clone -b 9.x https://github.com/amazeeio/drupal-example-simple.git lagoon-examples/drupal9-lagoon-simple-lando - - - name: Drupal 8 Simple - run: | - cd lagoon-examples/drupal8-simple; - docker-compose -p drupal8-example-simple up -d; - docker-compose -p drupal8-example-simple exec -T cli composer install; - sleep 5; - curl --HEAD http://drupal8-example-simple.docker.amazee.io; - curl --HEAD http://drupal8-example-simple.docker.amazee.io | grep "X-LAGOON"; - ../../pygmy-go-linux-amd64 --config ../../examples/pygmy.basic.yml status | grep '\- http://drupal8-example-simple.docker.amazee.io'; - docker-compose -p drupal8-example-simple down; - docker-compose -p drupal8-example-simple rm; - cd ../../; - name: Drupal 9 Advanced run: | @@ -161,17 +156,30 @@ jobs: docker-compose -p drupal9-advanced rm; cd ../../; - - name: Drupal 9 Simple + - name: Drupal 9 Base + run: | + cd lagoon-examples/drupal9-base; + docker-compose -p drupal-base up -d; + docker-compose -p drupal-base exec -T cli composer install; + sleep 5; + curl --HEAD http://drupal9-base.docker.amazee.io; + curl --HEAD http://drupal9-base.docker.amazee.io | grep "X-LAGOON"; + ../../pygmy-go-linux-amd64 --config ../../examples/pygmy.basic.yml status | grep '\- http://drupal9-base.docker.amazee.io'; + docker-compose -p drupal-base down; + docker-compose -p drupal-base rm; + cd ../../; + + - name: Drupal 9 Postgres run: | - cd lagoon-examples/drupal9-simple; - docker-compose -p drupal-example-simple up -d; - docker-compose -p drupal-example-simple exec -T cli composer install; + cd lagoon-examples/drupal9-postgres; + docker-compose -p drupal-postgres up -d; + docker-compose -p drupal-postgres exec -T cli composer install; sleep 5; - curl --HEAD http://drupal9-example-simple.docker.amazee.io; - curl --HEAD http://drupal9-example-simple.docker.amazee.io | grep "X-LAGOON"; - ../../pygmy-go-linux-amd64 --config ../../examples/pygmy.basic.yml status | grep '\- http://drupal9-example-simple.docker.amazee.io'; - docker-compose -p drupal-example-simple down; - docker-compose -p drupal-example-simple rm; + curl --HEAD http://drupal9-postgres.docker.amazee.io; + curl --HEAD http://drupal9-postgres.docker.amazee.io | grep "X-LAGOON"; + ../../pygmy-go-linux-amd64 --config ../../examples/pygmy.basic.yml status | grep '\- http://drupal9-postgres.docker.amazee.io'; + docker-compose -p drupal-postgres down; + docker-compose -p drupal-postgres rm; cd ../../; - name: Node @@ -226,15 +234,15 @@ jobs: - name: Lando test - running Pygmy along-side Lando run: | - cd lagoon-examples/drupal9-lagoon-simple-lando; + cd lagoon-examples/drupal9-base; lando start || true; sleep 5; - curl --HEAD http://drupal9-example-simple.lndo.site:8000; - curl --HEAD http://drupal9-example-simple.lndo.site:8000 | grep "X-Lagoon"; + curl --HEAD http://drupal9-base.lndo.site:8000; + curl --HEAD http://drupal9-base.lndo.site:8000 | grep "X-Lagoon"; lando destroy -y; cd ../../; - - name: Test the down commandWordpress + - name: Test the down command run: | ./pygmy-go-linux-amd64 --config examples/pygmy.basic.yml down | grep 'Successfully stopped amazeeio'; ./pygmy-go-linux-amd64 --config examples/pygmy.basic.yml status | grep '\[ \] amazeeio-' | grep 'is not running'; @@ -249,4 +257,6 @@ jobs: run: ./pygmy-go-linux-amd64 clean; - name: Cleanup after tests. - run: docker system prune --all --force + run: | + docker system prune --all --force + docker volume prune --force diff --git a/.gitignore b/.gitignore index e2e8e70b..d1151312 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ builds/* dist/* -vendor/* \ No newline at end of file +vendor/* +.idea/* \ No newline at end of file diff --git a/.goreleaser.yml b/.goreleaser.yml index 25b435e5..a94eb8f3 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -43,10 +43,10 @@ brews: - ids: - pygmy-go tap: - owner: fubarhouse - name: homebrew-pygmy-go + owner: pygmystack + name: homebrew-pygmy folder: Formula - homepage: "https://github.com/fubarhouse/pygmy-go" + homepage: "https://github.com/pygmystack/pygmy" description: "amazee.io's local development helper tool" skip_upload: false test: system "#{bin}/pygmy-go version" diff --git a/Dockerfile b/Dockerfile index e07a61bd..014b98aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM golang:alpine as builder LABEL stage=builder -COPY main.go /go/src/github.com/fubarhouse/pygmy-go/ -COPY go.sum /go/src/github.com/fubarhouse/pygmy-go/ -COPY go.mod /go/src/github.com/fubarhouse/pygmy-go/ -COPY cmd/ /go/src/github.com/fubarhouse/pygmy-go/cmd/ -COPY service/ /go/src/github.com/fubarhouse/pygmy-go/service/ +COPY main.go /go/src/github.com/pygmystack/pygmy/ +COPY go.sum /go/src/github.com/pygmystack/pygmy/ +COPY go.mod /go/src/github.com/pygmystack/pygmy/ +COPY cmd/ /go/src/github.com/pygmystack/pygmy/cmd/ +COPY service/ /go/src/github.com/pygmystack/pygmy/service/ -WORKDIR /go/src/github.com/fubarhouse/pygmy-go/ +WORKDIR /go/src/github.com/pygmystack/pygmy/ RUN GO111MODULE=on go mod verify RUN GO111MODULE=on GOOS=linux GOARCH=386 go build -o pygmy-go-linux-386 . RUN GO111MODULE=on GOOS=linux GOARCH=386 CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o pygmy-go-linux-386-static . @@ -22,14 +22,14 @@ RUN GO111MODULE=on GOOS=windows GOARCH=amd64 go build -o pygmy-go.exe . FROM alpine WORKDIR /app -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-linux-386 . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-linux-386-static . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-linux-arm . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-linux-arm-static . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-linux-arm64 . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-linux-arm64-static . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-linux-amd64 . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-linux-amd64-static . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-darwin-amd64 . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go-darwin-arm64 . -COPY --from=builder /go/src/github.com/fubarhouse/pygmy-go/pygmy-go.exe . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-linux-386 . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-linux-386-static . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-linux-arm . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-linux-arm-static . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-linux-arm64 . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-linux-arm64-static . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-linux-amd64 . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-linux-amd64-static . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-darwin-amd64 . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go-darwin-arm64 . +COPY --from=builder /go/src/github.com/pygmystack/pygmy/pygmy-go.exe . diff --git a/README.md b/README.md index 8c6ec862..a889cb6d 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ # Pygmy [![Stability](https://img.shields.io/badge/stability-stable-green.svg)]() -[![Travis CI](https://travis-ci.com/fubarhouse/pygmy-go.svg?branch=main)](https://travis-ci.com/fubarhouse/pygmy-go) -![goreleaser](https://github.com/fubarhouse/pygmy-go/workflows/goreleaser/badge.svg) -[![Go Report Card](https://goreportcard.com/badge/github.com/fubarhouse/pygmy-go)](https://goreportcard.com/report/github.com/fubarhouse/pygmy-go) -[![GoDoc](https://godoc.org/github.com/fubarhouse/pygmy-go?status.svg)](https://godoc.org/github.com/fubarhouse/pygmy-go) +![goreleaser](https://github.com/pygmystack/pygmy/workflows/goreleaser/badge.svg) +[![Go Report Card](https://goreportcard.com/badge/github.com/pygmystack/pygmy)](https://goreportcard.com/report/github.com/pygmystack/pygmy) +[![GoDoc](https://godoc.org/github.com/pygmystack/pygmy?status.svg)](https://godoc.org/github.com/pygmystack/pygmy) This is an application written in Go which is a proposed replacement for [Pygmy](https://pygmy.readthedocs.io/en/master/) currently written in Ruby. The goal is to provide a better cross-platform experience @@ -44,7 +43,7 @@ configuration to switch out the `haproxy` image for a compatible one if you'd li **Works for**: Linux, MacOS & Windows ```shell -git clone https://github.com/fubarhouse/pygmy-go.git && cd pygmy-go; +git clone https://github.com/pygmystack/pygmy.git && cd pygmy-go; make build; cp ./builds/pygmy-go-darwin /usr/local/bin/pygmy-go; chmod +x /usr/local/bin/pygmy-go; @@ -58,8 +57,8 @@ as `pygmy`. Now start Pygmy and use the new `status` command. **Works for**: Linux & MacOS ```shell -brew tap fubarhouse/pygmy-go; -brew install pygmy-go; +brew tap pygmystack/pygmy; +brew install pygmy; ``` ### Using the AUR @@ -122,7 +121,7 @@ It will use `dind` and your local daemon to walk through several tests which sho 1. First clone the project: ``` - git clone https://github.com/fubarhouse/pygmy-go.git pygmy-go && cd pygmy-go + git clone https://github.com/pygmystack/pygmy.git pygmy-go && cd pygmy-go ``` 2. Perform any updates as required. 3. Clean the environment. diff --git a/cmd/addkey.go b/cmd/addkey.go index c04e6bdd..61adb3c2 100644 --- a/cmd/addkey.go +++ b/cmd/addkey.go @@ -24,8 +24,8 @@ import ( "fmt" "os" - "github.com/fubarhouse/pygmy-go/service/interface/docker" - "github.com/fubarhouse/pygmy-go/service/library" + "github.com/pygmystack/pygmy/service/interface/docker" + "github.com/pygmystack/pygmy/service/library" "github.com/spf13/cobra" ) diff --git a/cmd/clean.go b/cmd/clean.go index 914795e4..e263f3fe 100644 --- a/cmd/clean.go +++ b/cmd/clean.go @@ -21,8 +21,9 @@ package cmd import ( - "github.com/fubarhouse/pygmy-go/service/library" "github.com/spf13/cobra" + + "github.com/pygmystack/pygmy/service/library" ) // stopCmd represents the stop command diff --git a/cmd/down.go b/cmd/down.go index 5467f706..dd6279ff 100644 --- a/cmd/down.go +++ b/cmd/down.go @@ -21,7 +21,7 @@ package cmd import ( - "github.com/fubarhouse/pygmy-go/service/library" + "github.com/pygmystack/pygmy/service/library" "github.com/spf13/cobra" ) diff --git a/cmd/export.go b/cmd/export.go index df0d1579..4749993a 100644 --- a/cmd/export.go +++ b/cmd/export.go @@ -22,10 +22,12 @@ package cmd import ( "fmt" - "github.com/fubarhouse/pygmy-go/service/library" + "os" + "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" - "os" + + "github.com/pygmystack/pygmy/service/library" ) var exportPath string diff --git a/cmd/pull.go b/cmd/pull.go index e0ee16d4..481980c4 100644 --- a/cmd/pull.go +++ b/cmd/pull.go @@ -21,7 +21,7 @@ package cmd import ( - "github.com/fubarhouse/pygmy-go/service/library" + "github.com/pygmystack/pygmy/service/library" "github.com/spf13/cobra" ) diff --git a/cmd/restart.go b/cmd/restart.go index dafe59f2..fca64322 100644 --- a/cmd/restart.go +++ b/cmd/restart.go @@ -24,9 +24,10 @@ import ( "fmt" "os" - "github.com/fubarhouse/pygmy-go/service/library" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" + + "github.com/pygmystack/pygmy/service/library" ) // restartCmd represents the restart command diff --git a/cmd/root.go b/cmd/root.go index 361d0fb5..b16b3958 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -26,10 +26,11 @@ import ( "runtime" "strings" - "github.com/fubarhouse/pygmy-go/service/library" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/pygmystack/pygmy/service/library" ) var ( diff --git a/cmd/status.go b/cmd/status.go index 92813256..5a0bdd0c 100644 --- a/cmd/status.go +++ b/cmd/status.go @@ -21,7 +21,7 @@ package cmd import ( - "github.com/fubarhouse/pygmy-go/service/library" + "github.com/pygmystack/pygmy/service/library" "github.com/spf13/cobra" ) diff --git a/cmd/up.go b/cmd/up.go index 2c12a437..8117d95c 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -24,9 +24,10 @@ import ( "fmt" "os" - "github.com/fubarhouse/pygmy-go/service/library" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" + + "github.com/pygmystack/pygmy/service/library" ) // upCmd represents the up command diff --git a/cmd/update.go b/cmd/update.go index 9f6df306..178d9d17 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -21,7 +21,7 @@ package cmd import ( - "github.com/fubarhouse/pygmy-go/service/library" + "github.com/pygmystack/pygmy/service/library" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index c62bbfdc..27f1d1c6 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -21,7 +21,7 @@ package cmd import ( - "github.com/fubarhouse/pygmy-go/service/library" + "github.com/pygmystack/pygmy/service/library" "github.com/spf13/cobra" ) diff --git a/docs/installation.md b/docs/installation.md index 5a3ae0d5..1da718fe 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -10,13 +10,13 @@ Make sure you have the following dependencies installed: ### Installing from a precompiled binary -Releases on GitHub accompany binaries [available for download](https://github.com/fubarhouse/pygmy-go/releases). +Releases on GitHub accompany binaries [available for download](https://github.com/pygmystack/pygmy/releases). To install it, put the binary into your system's `$PATH` environment variable and make it executable. The following is an example of how you would do this, note the URL and location may change depending on your needs. ```console -$ wget https://github.com/fubarhouse/pygmy-go/releases/download/v0.1.0/pygmy-go-darwin +$ wget https://github.com/pygmystack/pygmy/releases/download/v0.1.0/pygmy-go-darwin $ mv ./pygmy-go-darwin /usr/local/bin/pygmy $ chmod u+x /usr/local/bin/pygmy ``` @@ -32,5 +32,5 @@ From here you can follow the guidance to install the relevant executable in the The installation of `pygmy` is fairly simple and can be accomplished via the go toolchain ```console -$ go get github.com/fubarhouse/pygmy +$ go get github.com/pygmystack/pygmy ``` \ No newline at end of file diff --git a/go.mod b/go.mod index 1e6d0baa..6ed5b46d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/fubarhouse/pygmy-go +module github.com/pygmystack/pygmy go 1.16 diff --git a/main.go b/main.go index ebb00c70..22431b98 100644 --- a/main.go +++ b/main.go @@ -1,4 +1,4 @@ -// Copyright © 2019 NAME HERE +// Copyright © 2019 Amazee.io // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ package main import ( - "github.com/fubarhouse/pygmy-go/cmd" + "github.com/pygmystack/pygmy/cmd" ) func main() { diff --git a/main_test.go b/main_test.go index e1e1e64a..c13457ee 100644 --- a/main_test.go +++ b/main_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" - "github.com/fubarhouse/pygmy-go/service/interface/docker" + "github.com/pygmystack/pygmy/service/interface/docker" . "github.com/smartystreets/goconvey/convey" ) diff --git a/service/dnsmasq/dnsmasq.go b/service/dnsmasq/dnsmasq.go index 97cb1b3f..1bef08cc 100644 --- a/service/dnsmasq/dnsmasq.go +++ b/service/dnsmasq/dnsmasq.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" - model "github.com/fubarhouse/pygmy-go/service/interface" + model "github.com/pygmystack/pygmy/service/interface" ) // New will provide the standard object for the dnsmasq container. diff --git a/service/dnsmasq/dnsmasq_test.go b/service/dnsmasq/dnsmasq_test.go index fdebaf46..1a99969a 100644 --- a/service/dnsmasq/dnsmasq_test.go +++ b/service/dnsmasq/dnsmasq_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/docker/go-connections/nat" - "github.com/fubarhouse/pygmy-go/service/dnsmasq" - model "github.com/fubarhouse/pygmy-go/service/interface" + "github.com/pygmystack/pygmy/service/dnsmasq" + model "github.com/pygmystack/pygmy/service/interface" . "github.com/smartystreets/goconvey/convey" ) diff --git a/service/endpoint/endpoint_test.go b/service/endpoint/endpoint_test.go index bdcc5669..d9a25f2f 100644 --- a/service/endpoint/endpoint_test.go +++ b/service/endpoint/endpoint_test.go @@ -3,7 +3,7 @@ package endpoint_test import ( "testing" - "github.com/fubarhouse/pygmy-go/service/endpoint" + "github.com/pygmystack/pygmy/service/endpoint" . "github.com/smartystreets/goconvey/convey" ) diff --git a/service/haproxy/haproxy.go b/service/haproxy/haproxy.go index 8614e1c3..ce8c31fd 100644 --- a/service/haproxy/haproxy.go +++ b/service/haproxy/haproxy.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" - model "github.com/fubarhouse/pygmy-go/service/interface" + model "github.com/pygmystack/pygmy/service/interface" ) // New will provide the standard object for the haproxy container. diff --git a/service/haproxy/haproxy_test.go b/service/haproxy/haproxy_test.go index 3abddd57..cc0d1517 100644 --- a/service/haproxy/haproxy_test.go +++ b/service/haproxy/haproxy_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/docker/go-connections/nat" - "github.com/fubarhouse/pygmy-go/service/haproxy" - model "github.com/fubarhouse/pygmy-go/service/interface" + "github.com/pygmystack/pygmy/service/haproxy" + model "github.com/pygmystack/pygmy/service/interface" . "github.com/smartystreets/goconvey/convey" ) diff --git a/service/interface/docker/docker.go b/service/interface/docker/docker.go index a5f0602c..931055fb 100644 --- a/service/interface/docker/docker.go +++ b/service/interface/docker/docker.go @@ -20,7 +20,7 @@ import ( "github.com/docker/docker/api/types/network" volumetypes "github.com/docker/docker/api/types/volume" "github.com/docker/docker/client" - "github.com/fubarhouse/pygmy-go/service/endpoint" + "github.com/pygmystack/pygmy/service/endpoint" ) // DockerContainerList will return a slice of containers diff --git a/service/interface/interface.go b/service/interface/interface.go index e5f87eaa..361057ee 100644 --- a/service/interface/interface.go +++ b/service/interface/interface.go @@ -7,9 +7,10 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/client" - "github.com/fubarhouse/pygmy-go/service/color" - "github.com/fubarhouse/pygmy-go/service/interface/docker" . "github.com/logrusorgru/aurora" + + "github.com/pygmystack/pygmy/service/color" + "github.com/pygmystack/pygmy/service/interface/docker" ) // Setup will detect if the Service's image reference exists and will diff --git a/service/library/clean.go b/service/library/clean.go index 654ffbe3..a439ea20 100644 --- a/service/library/clean.go +++ b/service/library/clean.go @@ -4,9 +4,10 @@ import ( "fmt" "strings" - "github.com/fubarhouse/pygmy-go/service/color" - "github.com/fubarhouse/pygmy-go/service/interface/docker" . "github.com/logrusorgru/aurora" + + "github.com/pygmystack/pygmy/service/color" + "github.com/pygmystack/pygmy/service/interface/docker" ) // Clean will forcibly kill and remove all of pygmy's containers in the daemon diff --git a/service/library/library.go b/service/library/library.go index 188b0dd6..b3a3a018 100644 --- a/service/library/library.go +++ b/service/library/library.go @@ -5,9 +5,10 @@ import ( "fmt" "github.com/docker/docker/api/types" - model "github.com/fubarhouse/pygmy-go/service/interface" - "github.com/fubarhouse/pygmy-go/service/resolv" "github.com/imdario/mergo" + + model "github.com/pygmystack/pygmy/service/interface" + "github.com/pygmystack/pygmy/service/resolv" ) // Config is a struct of configurable options which can diff --git a/service/library/network.go b/service/library/network.go index 65d20ede..c5841fd0 100644 --- a/service/library/network.go +++ b/service/library/network.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/client" - "github.com/fubarhouse/pygmy-go/service/interface/docker" + "github.com/pygmystack/pygmy/service/interface/docker" ) // NetworkCreate is part of a centralised abstraction of the Docker API diff --git a/service/library/setup.go b/service/library/setup.go index 752e7551..f26e25d4 100644 --- a/service/library/setup.go +++ b/service/library/setup.go @@ -8,16 +8,17 @@ import ( "strings" "github.com/docker/docker/api/types" - "github.com/fubarhouse/pygmy-go/service/dnsmasq" - "github.com/fubarhouse/pygmy-go/service/haproxy" - model "github.com/fubarhouse/pygmy-go/service/interface" - "github.com/fubarhouse/pygmy-go/service/interface/docker" - "github.com/fubarhouse/pygmy-go/service/mailhog" - "github.com/fubarhouse/pygmy-go/service/network" - "github.com/fubarhouse/pygmy-go/service/resolv" - "github.com/fubarhouse/pygmy-go/service/ssh/agent" - "github.com/fubarhouse/pygmy-go/service/ssh/key" "github.com/spf13/viper" + + "github.com/pygmystack/pygmy/service/dnsmasq" + "github.com/pygmystack/pygmy/service/haproxy" + model "github.com/pygmystack/pygmy/service/interface" + "github.com/pygmystack/pygmy/service/interface/docker" + "github.com/pygmystack/pygmy/service/mailhog" + "github.com/pygmystack/pygmy/service/network" + "github.com/pygmystack/pygmy/service/resolv" + "github.com/pygmystack/pygmy/service/ssh/agent" + "github.com/pygmystack/pygmy/service/ssh/key" ) // ImportDefaults is an exported function which allows third-party applications diff --git a/service/library/sshkeyadd.go b/service/library/sshkeyadd.go index 445e7dea..73293c3a 100644 --- a/service/library/sshkeyadd.go +++ b/service/library/sshkeyadd.go @@ -6,7 +6,7 @@ import ( "runtime" "strings" - "github.com/fubarhouse/pygmy-go/service/ssh/agent" + "github.com/pygmystack/pygmy/service/ssh/agent" ) // SshKeyAdd will add a given key to the ssh agent. diff --git a/service/library/status.go b/service/library/status.go index 2c433a71..23db3f0d 100644 --- a/service/library/status.go +++ b/service/library/status.go @@ -4,12 +4,13 @@ import ( "fmt" "strings" - "github.com/fubarhouse/pygmy-go/service/color" - "github.com/fubarhouse/pygmy-go/service/endpoint" - model "github.com/fubarhouse/pygmy-go/service/interface" - "github.com/fubarhouse/pygmy-go/service/interface/docker" - "github.com/fubarhouse/pygmy-go/service/resolv" . "github.com/logrusorgru/aurora" + + "github.com/pygmystack/pygmy/service/color" + "github.com/pygmystack/pygmy/service/endpoint" + model "github.com/pygmystack/pygmy/service/interface" + "github.com/pygmystack/pygmy/service/interface/docker" + "github.com/pygmystack/pygmy/service/resolv" ) // Status will show the state of all the things Pygmy manages. diff --git a/service/library/up.go b/service/library/up.go index 3e66652f..ea929fcb 100644 --- a/service/library/up.go +++ b/service/library/up.go @@ -5,11 +5,12 @@ import ( "os" "strings" - "github.com/fubarhouse/pygmy-go/service/color" - "github.com/fubarhouse/pygmy-go/service/endpoint" - model "github.com/fubarhouse/pygmy-go/service/interface" - "github.com/fubarhouse/pygmy-go/service/interface/docker" . "github.com/logrusorgru/aurora" + + "github.com/pygmystack/pygmy/service/color" + "github.com/pygmystack/pygmy/service/endpoint" + model "github.com/pygmystack/pygmy/service/interface" + "github.com/pygmystack/pygmy/service/interface/docker" ) // Up will bring Pygmy up. diff --git a/service/library/update.go b/service/library/update.go index 85e647f0..6bea61ca 100644 --- a/service/library/update.go +++ b/service/library/update.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/fubarhouse/pygmy-go/service/interface/docker" + "github.com/pygmystack/pygmy/service/interface/docker" ) // Update will update the the images for all configured services. diff --git a/service/mailhog/mailhog.go b/service/mailhog/mailhog.go index a24f807e..643acee8 100644 --- a/service/mailhog/mailhog.go +++ b/service/mailhog/mailhog.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" - model "github.com/fubarhouse/pygmy-go/service/interface" + model "github.com/pygmystack/pygmy/service/interface" ) // New will provide the standard object for the mailhog container. diff --git a/service/mailhog/mailhog_test.go b/service/mailhog/mailhog_test.go index 39a01b83..5e5e983e 100644 --- a/service/mailhog/mailhog_test.go +++ b/service/mailhog/mailhog_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/docker/go-connections/nat" - model "github.com/fubarhouse/pygmy-go/service/interface" - "github.com/fubarhouse/pygmy-go/service/mailhog" + model "github.com/pygmystack/pygmy/service/interface" + "github.com/pygmystack/pygmy/service/mailhog" . "github.com/smartystreets/goconvey/convey" ) diff --git a/service/network/network_test.go b/service/network/network_test.go index 7bb52aff..7a9bf52d 100644 --- a/service/network/network_test.go +++ b/service/network/network_test.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/api/types/network" "testing" - n "github.com/fubarhouse/pygmy-go/service/network" + n "github.com/pygmystack/pygmy/service/network" . "github.com/smartystreets/goconvey/convey" ) diff --git a/service/resolv/resolv.go b/service/resolv/resolv.go index c7c6d0a7..e65e4ebe 100644 --- a/service/resolv/resolv.go +++ b/service/resolv/resolv.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package resolv @@ -10,9 +11,10 @@ import ( "runtime" "strings" - "github.com/fubarhouse/pygmy-go/service/color" - model "github.com/fubarhouse/pygmy-go/service/interface" . "github.com/logrusorgru/aurora" + + "github.com/pygmystack/pygmy/service/color" + model "github.com/pygmystack/pygmy/service/interface" ) // run will run a shell command and is not exported. diff --git a/service/resolv/resolvWin.go b/service/resolv/resolvWin.go index 4267f35b..631f7e15 100644 --- a/service/resolv/resolvWin.go +++ b/service/resolv/resolvWin.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package resolv @@ -9,7 +10,7 @@ import ( "strings" "sync" - model "github.com/fubarhouse/pygmy-go/service/interface" + model "github.com/pygmystack/pygmy/service/interface" ) // run will run a shell command and is not exported. diff --git a/service/ssh/agent/ssh_agent.go b/service/ssh/agent/ssh_agent.go index 17450367..d072d1a3 100644 --- a/service/ssh/agent/ssh_agent.go +++ b/service/ssh/agent/ssh_agent.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" - model "github.com/fubarhouse/pygmy-go/service/interface" + model "github.com/pygmystack/pygmy/service/interface" ) // New will provide the standard object for the SSH agent container. diff --git a/service/ssh/agent/ssh_agent_test.go b/service/ssh/agent/ssh_agent_test.go index b4f7e14d..5ddc651d 100644 --- a/service/ssh/agent/ssh_agent_test.go +++ b/service/ssh/agent/ssh_agent_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - model "github.com/fubarhouse/pygmy-go/service/interface" - "github.com/fubarhouse/pygmy-go/service/ssh/agent" + model "github.com/pygmystack/pygmy/service/interface" + "github.com/pygmystack/pygmy/service/ssh/agent" . "github.com/smartystreets/goconvey/convey" ) diff --git a/service/ssh/key/ssh_addkey.go b/service/ssh/key/ssh_addkey.go index ea1d49d9..39723fb5 100644 --- a/service/ssh/key/ssh_addkey.go +++ b/service/ssh/key/ssh_addkey.go @@ -1,11 +1,13 @@ -// +build darwin linux +//go:build !windows +// +build !windows package key import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" - model "github.com/fubarhouse/pygmy-go/service/interface" + + model "github.com/pygmystack/pygmy/service/interface" ) // NewAdder will provide the standard object for the SSH key adder container. diff --git a/service/ssh/key/ssh_addkey_test.go b/service/ssh/key/ssh_addkey_test.go index b5b2a3ed..8f958f4d 100644 --- a/service/ssh/key/ssh_addkey_test.go +++ b/service/ssh/key/ssh_addkey_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/fubarhouse/pygmy-go/service/ssh/key" + "github.com/pygmystack/pygmy/service/ssh/key" . "github.com/smartystreets/goconvey/convey" ) diff --git a/service/ssh/key/ssh_addkey_win.go b/service/ssh/key/ssh_addkey_win.go index e0a2c3cf..90b6ea7a 100644 --- a/service/ssh/key/ssh_addkey_win.go +++ b/service/ssh/key/ssh_addkey_win.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package key @@ -5,7 +6,7 @@ package key import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" - model "github.com/fubarhouse/pygmy-go/service/interface" + model "github.com/pygmystack/pygmy/service/interface" ) // NewAdder will provide the standard object for the SSH key adder container.