From 98aac05e42b8745a8d3e88bd57cdb63828e88338 Mon Sep 17 00:00:00 2001 From: Michel Heusschen <59014050+michelheusschen@users.noreply.github.com> Date: Fri, 14 Jul 2023 10:12:42 +0200 Subject: [PATCH] change name --- .github/workflows/docker-publish.yml | 2 +- .goreleaser.yaml | 88 ++++++++-------------------- cmd/exporter.go | 6 +- go.mod | 2 +- main.go | 2 +- pkg/api/api.go | 2 +- pkg/api/device_test.go | 2 +- pkg/collector/client.go | 2 +- pkg/collector/controller.go | 2 +- pkg/collector/device.go | 2 +- pkg/collector/port.go | 2 +- 11 files changed, 37 insertions(+), 75 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index e0fa338..f898d1d 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -36,6 +36,6 @@ jobs: uses: goreleaser/goreleaser-action@v4 with: version: latest - args: release --rm-dist + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index c6dd52a..c5a7e5a 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -23,17 +23,11 @@ builds: dockers: - image_templates: - - "docker.io/chhaley/omada_exporter:latest-amd64" - - "docker.io/chhaley/omada_exporter:{{ .Version }}-amd64" - - "docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64" - - "docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }}-amd64" - - "docker.io/chhaley/omada_exporter:{{ .Major }}-amd64" - - - "ghcr.io/charlie-haley/omada_exporter:latest-amd64" - - "ghcr.io/charlie-haley/omada_exporter:{{ .Version }}-amd64" - - "ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64" - - "ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }}-amd64" - - "ghcr.io/charlie-haley/omada_exporter:{{ .Major }}-amd64" + - "ghcr.io/michelheusschen/omada_exporter:latest-amd64" + - "ghcr.io/michelheusschen/omada_exporter:{{ .Version }}-amd64" + - "ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64" + - "ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }}-amd64" + - "ghcr.io/michelheusschen/omada_exporter:{{ .Major }}-amd64" use: buildx dockerfile: Dockerfile goarch: amd64 @@ -48,17 +42,11 @@ dockers: - "--build-arg=VCS_REF={{.FullCommit}}" - "--platform=linux/amd64" - image_templates: - - "docker.io/chhaley/omada_exporter:latest-arm64v8" - - "docker.io/chhaley/omada_exporter:{{ .Version }}-arm64v8" - - "docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64v8" - - "docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }}-arm64v8" - - "docker.io/chhaley/omada_exporter:{{ .Major }}-arm64v8" - - - "ghcr.io/charlie-haley/omada_exporter:latest-arm64v8" - - "ghcr.io/charlie-haley/omada_exporter:{{ .Version }}-arm64v8" - - "ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64v8" - - "ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }}-arm64v8" - - "ghcr.io/charlie-haley/omada_exporter:{{ .Major }}-arm64v8" + - "ghcr.io/michelheusschen/omada_exporter:latest-arm64v8" + - "ghcr.io/michelheusschen/omada_exporter:{{ .Version }}-arm64v8" + - "ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64v8" + - "ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }}-arm64v8" + - "ghcr.io/michelheusschen/omada_exporter:{{ .Major }}-arm64v8" use: buildx dockerfile: Dockerfile goarch: arm64 @@ -74,57 +62,31 @@ dockers: - "--platform=linux/arm64/v8" docker_manifests: -## Docker Hub - - name_template: docker.io/chhaley/omada_exporter:latest - image_templates: - - docker.io/chhaley/omada_exporter:latest-amd64 - - docker.io/chhaley/omada_exporter:latest-arm64v8 - - - name_template: docker.io/chhaley/omada_exporter:{{ .Version }} - image_templates: - - docker.io/chhaley/omada_exporter:{{ .Version }}-amd64 - - docker.io/chhaley/omada_exporter:{{ .Version }}-arm64v8 - - - name_template: docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }} - image_templates: - - docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64 - - docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64v8 - - - name_template: docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }} - image_templates: - - docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }}-amd64 - - docker.io/chhaley/omada_exporter:{{ .Major }}.{{ .Minor }}-arm64v8 - - - name_template: docker.io/chhaley/omada_exporter:{{ .Major }} - image_templates: - - docker.io/chhaley/omada_exporter:{{ .Major }}-amd64 - - docker.io/chhaley/omada_exporter:{{ .Major }}-arm64v8 - ## GHCR - - name_template: ghcr.io/charlie-haley/omada_exporter:latest + - name_template: ghcr.io/michelheusschen/omada_exporter:latest image_templates: - - ghcr.io/charlie-haley/omada_exporter:latest-amd64 - - ghcr.io/charlie-haley/omada_exporter:latest-arm64v8 + - ghcr.io/michelheusschen/omada_exporter:latest-amd64 + - ghcr.io/michelheusschen/omada_exporter:latest-arm64v8 - - name_template: ghcr.io/charlie-haley/omada_exporter:{{ .Version }} + - name_template: ghcr.io/michelheusschen/omada_exporter:{{ .Version }} image_templates: - - ghcr.io/charlie-haley/omada_exporter:{{ .Version }}-amd64 - - ghcr.io/charlie-haley/omada_exporter:{{ .Version }}-arm64v8 + - ghcr.io/michelheusschen/omada_exporter:{{ .Version }}-amd64 + - ghcr.io/michelheusschen/omada_exporter:{{ .Version }}-arm64v8 - - name_template: ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }} + - name_template: ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }} image_templates: - - ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64 - - ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64v8 + - ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64 + - ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64v8 - - name_template: ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }} + - name_template: ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }} image_templates: - - ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }}-amd64 - - ghcr.io/charlie-haley/omada_exporter:{{ .Major }}.{{ .Minor }}-arm64v8 + - ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }}-amd64 + - ghcr.io/michelheusschen/omada_exporter:{{ .Major }}.{{ .Minor }}-arm64v8 - - name_template: ghcr.io/charlie-haley/omada_exporter:{{ .Major }} + - name_template: ghcr.io/michelheusschen/omada_exporter:{{ .Major }} image_templates: - - ghcr.io/charlie-haley/omada_exporter:{{ .Major }}-amd64 - - ghcr.io/charlie-haley/omada_exporter:{{ .Major }}-arm64v8 + - ghcr.io/michelheusschen/omada_exporter:{{ .Major }}-amd64 + - ghcr.io/michelheusschen/omada_exporter:{{ .Major }}-arm64v8 release: prerelease: auto diff --git a/cmd/exporter.go b/cmd/exporter.go index a9dbf37..be654a4 100644 --- a/cmd/exporter.go +++ b/cmd/exporter.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/charlie-haley/omada_exporter/pkg/api" - "github.com/charlie-haley/omada_exporter/pkg/collector" - "github.com/charlie-haley/omada_exporter/pkg/config" + "github.com/michelheusschen/omada_exporter/pkg/api" + "github.com/michelheusschen/omada_exporter/pkg/collector" + "github.com/michelheusschen/omada_exporter/pkg/config" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" zerolog "github.com/rs/zerolog" diff --git a/go.mod b/go.mod index 2822a85..49c4cf0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/charlie-haley/omada_exporter +module github.com/michelheusschen/omada_exporter go 1.19 diff --git a/main.go b/main.go index 375349e..404fb38 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/charlie-haley/omada_exporter/cmd" + "github.com/michelheusschen/omada_exporter/cmd" ) func main() { diff --git a/pkg/api/api.go b/pkg/api/api.go index a110114..6e42086 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -7,7 +7,7 @@ import ( "net/http/cookiejar" "time" - "github.com/charlie-haley/omada_exporter/pkg/config" + "github.com/michelheusschen/omada_exporter/pkg/config" log "github.com/rs/zerolog/log" ) diff --git a/pkg/api/device_test.go b/pkg/api/device_test.go index 4b8073b..f74d923 100644 --- a/pkg/api/device_test.go +++ b/pkg/api/device_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/charlie-haley/omada_exporter/pkg/config" + "github.com/michelheusschen/omada_exporter/pkg/config" ) func createMockServer() (*http.Client, *httptest.Server) { diff --git a/pkg/collector/client.go b/pkg/collector/client.go index e58748e..8aa8b56 100644 --- a/pkg/collector/client.go +++ b/pkg/collector/client.go @@ -3,7 +3,7 @@ package collector import ( "fmt" - "github.com/charlie-haley/omada_exporter/pkg/api" + "github.com/michelheusschen/omada_exporter/pkg/api" "github.com/prometheus/client_golang/prometheus" log "github.com/rs/zerolog/log" ) diff --git a/pkg/collector/controller.go b/pkg/collector/controller.go index 4274edd..2598d48 100644 --- a/pkg/collector/controller.go +++ b/pkg/collector/controller.go @@ -1,7 +1,7 @@ package collector import ( - "github.com/charlie-haley/omada_exporter/pkg/api" + "github.com/michelheusschen/omada_exporter/pkg/api" "github.com/prometheus/client_golang/prometheus" log "github.com/rs/zerolog/log" ) diff --git a/pkg/collector/device.go b/pkg/collector/device.go index 0e06b9f..2db0b1e 100644 --- a/pkg/collector/device.go +++ b/pkg/collector/device.go @@ -1,7 +1,7 @@ package collector import ( - "github.com/charlie-haley/omada_exporter/pkg/api" + "github.com/michelheusschen/omada_exporter/pkg/api" "github.com/prometheus/client_golang/prometheus" log "github.com/rs/zerolog/log" ) diff --git a/pkg/collector/port.go b/pkg/collector/port.go index 7d731f7..32e7376 100644 --- a/pkg/collector/port.go +++ b/pkg/collector/port.go @@ -3,7 +3,7 @@ package collector import ( "fmt" - "github.com/charlie-haley/omada_exporter/pkg/api" + "github.com/michelheusschen/omada_exporter/pkg/api" "github.com/prometheus/client_golang/prometheus" log "github.com/rs/zerolog/log" )