diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index e328148..7ca8190 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -7,11 +7,8 @@ env: PACKAGE_NAME: eia-api-go BINARY_PATH: bin BINARY_NAME: eia-client - GO_MOD_PATH: gitea.libretechconsulting.com/50w/eia-api-go + GO_MOD_PATH: gitea.libretechconsulting.com/rmcguire/eia-api-go GO_GIT_HOST: gitea.libretechconsulting.com - # DOCKER_HOST: "unix:///var/run/user/1000/docker.sock" - # DOCKER_ORG: "rmcguire" - # DOCKER_LATEST: "latest" jobs: build: @@ -32,6 +29,7 @@ jobs: env: API_TOKEN: ${{ secrets.API_TOKEN }} # Replace with a Gitea token stored in repository secrets run: | + echo "Pushing ./$BINARY_PATH/$BINARY_NAME to ${GITHUB_SERVER_URL} packages for ${GITHUB_REPOSITORY_OWNER} as ${PACKAGE_NAME}@${{ github.ref_name }}" if [ -f ./${BINARY_PATH}/${BINARY_NAME} ]; then curl -X PUT \ -H "Authorization: token ${API_TOKEN}" \ diff --git a/LICENSE b/LICENSE index fb4abba..f03de51 100644 --- a/LICENSE +++ b/LICENSE @@ -281,7 +281,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. eia-api-go - Copyright (C) 2024 50W + Copyright (C) 2024 Ryan D. McGuire This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -293,7 +293,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - eia-api-go Copyright (C) 2024 50W + eia-api-go Copyright (C) 2024 Ryan D. McGuire This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/cmd/eia-client/cmd/get/get_facet.go b/cmd/eia-client/cmd/get/get_facet.go index 9d22df6..4b5745a 100644 --- a/cmd/eia-client/cmd/get/get_facet.go +++ b/cmd/eia-client/cmd/get/get_facet.go @@ -6,7 +6,7 @@ import ( "github.com/goccy/go-yaml" "github.com/spf13/cobra" - "gitea.libretechconsulting.com/50W/eia-api-go/cmd/eia-client/internal/util" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/cmd/eia-client/internal/util" ) var GetFacetsCmd = &cobra.Command{ diff --git a/cmd/eia-client/cmd/get/get_route.go b/cmd/eia-client/cmd/get/get_route.go index 454ea21..c469329 100644 --- a/cmd/eia-client/cmd/get/get_route.go +++ b/cmd/eia-client/cmd/get/get_route.go @@ -8,8 +8,8 @@ import ( "github.com/goccy/go-yaml" "github.com/spf13/cobra" - "gitea.libretechconsulting.com/50W/eia-api-go/cmd/eia-client/internal/util" - "gitea.libretechconsulting.com/50W/eia-api-go/pkg/eia" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/cmd/eia-client/internal/util" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/pkg/eia" ) var ( diff --git a/cmd/eia-client/cmd/list/list_facets.go b/cmd/eia-client/cmd/list/list_facets.go index 4e2aca8..a3c92bb 100644 --- a/cmd/eia-client/cmd/list/list_facets.go +++ b/cmd/eia-client/cmd/list/list_facets.go @@ -4,7 +4,7 @@ import ( "github.com/k0kubun/pp/v3" "github.com/spf13/cobra" - "gitea.libretechconsulting.com/50W/eia-api-go/cmd/eia-client/internal/util" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/cmd/eia-client/internal/util" ) var listFacetsCmd = &cobra.Command{ diff --git a/cmd/eia-client/cmd/list/list_routes.go b/cmd/eia-client/cmd/list/list_routes.go index a1264cc..05c44fa 100644 --- a/cmd/eia-client/cmd/list/list_routes.go +++ b/cmd/eia-client/cmd/list/list_routes.go @@ -6,8 +6,8 @@ import ( "github.com/k0kubun/pp/v3" "github.com/spf13/cobra" - "gitea.libretechconsulting.com/50W/eia-api-go/cmd/eia-client/internal/util" - "gitea.libretechconsulting.com/50W/eia-api-go/pkg/eia" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/cmd/eia-client/internal/util" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/pkg/eia" ) var listRoutesCmd = &cobra.Command{ diff --git a/cmd/eia-client/cmd/root.go b/cmd/eia-client/cmd/root.go index 0b32c9f..75303e6 100644 --- a/cmd/eia-client/cmd/root.go +++ b/cmd/eia-client/cmd/root.go @@ -31,9 +31,9 @@ import ( "github.com/rs/zerolog" "github.com/spf13/cobra" - "gitea.libretechconsulting.com/50W/eia-api-go/cmd/eia-client/cmd/get" - "gitea.libretechconsulting.com/50W/eia-api-go/cmd/eia-client/cmd/list" - "gitea.libretechconsulting.com/50W/eia-api-go/cmd/eia-client/internal/util" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/cmd/eia-client/cmd/get" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/cmd/eia-client/cmd/list" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/cmd/eia-client/internal/util" ) // rootCmd represents the base command when called without any subcommands diff --git a/cmd/eia-client/internal/util/util_api.go b/cmd/eia-client/internal/util/util_api.go index 97b42fa..405d0be 100644 --- a/cmd/eia-client/internal/util/util_api.go +++ b/cmd/eia-client/internal/util/util_api.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog" "github.com/spf13/cobra" - "gitea.libretechconsulting.com/50W/eia-api-go/pkg/eia" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/pkg/eia" ) var ( diff --git a/cmd/eia-client/internal/util/util_completion.go b/cmd/eia-client/internal/util/util_completion.go index 2185473..4b46ff9 100644 --- a/cmd/eia-client/internal/util/util_completion.go +++ b/cmd/eia-client/internal/util/util_completion.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "gitea.libretechconsulting.com/50W/eia-api-go/pkg/eia" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/pkg/eia" ) // Given args of , complete either the route arg or the diff --git a/cmd/eia-client/internal/util/util_reflect.go b/cmd/eia-client/internal/util/util_reflect.go index 724dc41..039fad4 100644 --- a/cmd/eia-client/internal/util/util_reflect.go +++ b/cmd/eia-client/internal/util/util_reflect.go @@ -3,8 +3,8 @@ package util import ( "github.com/spf13/cobra" - eiaapi "gitea.libretechconsulting.com/50W/eia-api-go/api" - "gitea.libretechconsulting.com/50W/eia-api-go/pkg/eia" + eiaapi "gitea.libretechconsulting.com/rmcguire/eia-api-go/api" + "gitea.libretechconsulting.com/rmcguire/eia-api-go/pkg/eia" ) func GetRouteType(cmd *cobra.Command, route string) (eia.RouteType, error) { diff --git a/cmd/eia-client/main.go b/cmd/eia-client/main.go index 491a42e..1a30d42 100644 --- a/cmd/eia-client/main.go +++ b/cmd/eia-client/main.go @@ -21,7 +21,7 @@ THE SOFTWARE. */ package main -import "gitea.libretechconsulting.com/50W/eia-api-go/cmd/eia-client/cmd" +import "gitea.libretechconsulting.com/rmcguire/eia-api-go/cmd/eia-client/cmd" func main() { cmd.Execute() diff --git a/go.mod b/go.mod index 29673ad..c656908 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitea.libretechconsulting.com/50W/eia-api-go +module gitea.libretechconsulting.com/rmcguire/eia-api-go go 1.23.3 diff --git a/pkg/eia/eia.go b/pkg/eia/eia.go index f61c56d..82050df 100644 --- a/pkg/eia/eia.go +++ b/pkg/eia/eia.go @@ -12,7 +12,7 @@ import ( "github.com/deepmap/oapi-codegen/pkg/securityprovider" "github.com/rs/zerolog" - eiaapi "gitea.libretechconsulting.com/50W/eia-api-go/api" + eiaapi "gitea.libretechconsulting.com/rmcguire/eia-api-go/api" ) const ( diff --git a/pkg/eia/eia_logging.go b/pkg/eia/eia_logging.go index a245181..67cf1f5 100644 --- a/pkg/eia/eia_logging.go +++ b/pkg/eia/eia_logging.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" - eiaapi "gitea.libretechconsulting.com/50W/eia-api-go/api" + eiaapi "gitea.libretechconsulting.com/rmcguire/eia-api-go/api" ) func newLoggingMiddleware(logger *zerolog.Logger, level zerolog.Level) eiaapi.RequestEditorFn { diff --git a/pkg/eia/eia_reflection.go b/pkg/eia/eia_reflection.go index 1ec12e8..9a34306 100644 --- a/pkg/eia/eia_reflection.go +++ b/pkg/eia/eia_reflection.go @@ -11,7 +11,7 @@ import ( "strings" "time" - eiaapi "gitea.libretechconsulting.com/50W/eia-api-go/api" + eiaapi "gitea.libretechconsulting.com/rmcguire/eia-api-go/api" ) // For reflected API requests, dynamically replace certain diff --git a/pkg/eia/eia_reflection_test.go b/pkg/eia/eia_reflection_test.go index 1111a0d..7ad4158 100644 --- a/pkg/eia/eia_reflection_test.go +++ b/pkg/eia/eia_reflection_test.go @@ -7,7 +7,7 @@ import ( "k8s.io/utils/ptr" - eiaapi "gitea.libretechconsulting.com/50W/eia-api-go/api" + eiaapi "gitea.libretechconsulting.com/rmcguire/eia-api-go/api" ) func TestGetRoutes(t *testing.T) {