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 <karl.hepworth@gmail.com>
pygmystack · Jan 7, 2022 · 93af147 · 93af147
1 parent 0c0d099
commit 93af147
Show file tree

Hide file tree

Showing 46 changed files with 157 additions and 127 deletions.
diff --git 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
@@ -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
@@ -1,3 +1,4 @@
 builds/*
 dist/*
-vendor/*
+vendor/*
+.idea/*
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 ```
diff --git 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
@@ -1,4 +1,4 @@
-// Copyright © 2019 NAME HERE <EMAIL ADDRESS>
+// Copyright © 2019 Amazee.io <hello@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() {