From b38ccfc9d30fdc43c5e329813afb5ea18c0f6dfc Mon Sep 17 00:00:00 2001 From: catatsuy Date: Sat, 13 Apr 2024 15:09:31 +0900 Subject: [PATCH] Update package imports to use internal package structure --- .goreleaser.yml | 2 +- Makefile | 4 ++-- cmd/notify_slack/main.go | 2 +- {cli => internal/cli}/cli.go | 6 +++--- {cli => internal/cli}/cli_test.go | 4 ++-- {cli => internal/cli}/testdata/upload.txt | 0 {config => internal/config}/config.go | 0 {config => internal/config}/config_test.go | 2 +- {config => internal/config}/export_test.go | 0 {config => internal/config}/testdata/.gitignore | 0 {config => internal/config}/testdata/config.toml | 0 {config => internal/config}/testdata/etc/.gitkeep | 0 {slack => internal/slack}/client.go | 0 {slack => internal/slack}/client_test.go | 2 +- {slack => internal/slack}/export_test.go | 0 .../slack}/testdata/post_files_upload_fail.json | 0 .../slack}/testdata/post_files_upload_ok.json | 0 {slack => internal/slack}/testdata/post_text_fail.html | 0 {slack => internal/slack}/testdata/post_text_ok.html | 0 {throttle => internal/throttle}/exec.go | 0 {throttle => internal/throttle}/exec_test.go | 0 21 files changed, 11 insertions(+), 11 deletions(-) rename {cli => internal/cli}/cli.go (97%) rename {cli => internal/cli}/cli_test.go (98%) rename {cli => internal/cli}/testdata/upload.txt (100%) rename {config => internal/config}/config.go (100%) rename {config => internal/config}/config_test.go (98%) rename {config => internal/config}/export_test.go (100%) rename {config => internal/config}/testdata/.gitignore (100%) rename {config => internal/config}/testdata/config.toml (100%) rename {config => internal/config}/testdata/etc/.gitkeep (100%) rename {slack => internal/slack}/client.go (100%) rename {slack => internal/slack}/client_test.go (99%) rename {slack => internal/slack}/export_test.go (100%) rename {slack => internal/slack}/testdata/post_files_upload_fail.json (100%) rename {slack => internal/slack}/testdata/post_files_upload_ok.json (100%) rename {slack => internal/slack}/testdata/post_text_fail.html (100%) rename {slack => internal/slack}/testdata/post_text_ok.html (100%) rename {throttle => internal/throttle}/exec.go (100%) rename {throttle => internal/throttle}/exec_test.go (100%) diff --git a/.goreleaser.yml b/.goreleaser.yml index 59596ad..f43ac6d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -9,7 +9,7 @@ builds: binary: notify_slack ldflags: - -s -w - - -X github.com/catatsuy/notify_slack/cli.Version=v{{.Version}} + - -X github.com/catatsuy/notify_slack/internal/cli.Version=v{{.Version}} env: - CGO_ENABLED=0 goarch: diff --git a/Makefile b/Makefile index b46ff2e..9034544 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ all: bin/notify_slack bin/output go.mod go.sum: go mod tidy -bin/notify_slack: cmd/notify_slack/main.go slack/*.go throttle/*.go config/*.go cli/*.go go.mod go.sum - go build -ldflags "-X github.com/catatsuy/notify_slack/cli.Version=`git rev-list HEAD -n1`" -o bin/notify_slack cmd/notify_slack/main.go +bin/notify_slack: cmd/notify_slack/main.go internal/slack/*.go internal/throttle/*.go internal/config/*.go internal/cli/*.go go.mod go.sum + go build -ldflags "-X github.com/catatsuy/notify_slack/internal/cli.Version=`git rev-list HEAD -n1`" -o bin/notify_slack cmd/notify_slack/main.go bin/output: cmd/output/main.go go build -o bin/output cmd/output/main.go diff --git a/cmd/notify_slack/main.go b/cmd/notify_slack/main.go index bbea0ff..5bd022a 100644 --- a/cmd/notify_slack/main.go +++ b/cmd/notify_slack/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/catatsuy/notify_slack/cli" + "github.com/catatsuy/notify_slack/internal/cli" ) func main() { diff --git a/cli/cli.go b/internal/cli/cli.go similarity index 97% rename from cli/cli.go rename to internal/cli/cli.go index 931a1e7..be71597 100644 --- a/cli/cli.go +++ b/internal/cli/cli.go @@ -12,9 +12,9 @@ import ( "syscall" "time" - "github.com/catatsuy/notify_slack/config" - "github.com/catatsuy/notify_slack/slack" - "github.com/catatsuy/notify_slack/throttle" + "github.com/catatsuy/notify_slack/internal/config" + "github.com/catatsuy/notify_slack/internal/slack" + "github.com/catatsuy/notify_slack/internal/throttle" "golang.org/x/term" ) diff --git a/cli/cli_test.go b/internal/cli/cli_test.go similarity index 98% rename from cli/cli_test.go rename to internal/cli/cli_test.go index fcc331c..1b83a9c 100644 --- a/cli/cli_test.go +++ b/internal/cli/cli_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/catatsuy/notify_slack/config" - "github.com/catatsuy/notify_slack/slack" + "github.com/catatsuy/notify_slack/internal/config" + "github.com/catatsuy/notify_slack/internal/slack" ) type fakeSlackClient struct { diff --git a/cli/testdata/upload.txt b/internal/cli/testdata/upload.txt similarity index 100% rename from cli/testdata/upload.txt rename to internal/cli/testdata/upload.txt diff --git a/config/config.go b/internal/config/config.go similarity index 100% rename from config/config.go rename to internal/config/config.go diff --git a/config/config_test.go b/internal/config/config_test.go similarity index 98% rename from config/config_test.go rename to internal/config/config_test.go index 976029b..3239e10 100644 --- a/config/config_test.go +++ b/internal/config/config_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - . "github.com/catatsuy/notify_slack/config" + . "github.com/catatsuy/notify_slack/internal/config" ) func TestLoadTOML(t *testing.T) { diff --git a/config/export_test.go b/internal/config/export_test.go similarity index 100% rename from config/export_test.go rename to internal/config/export_test.go diff --git a/config/testdata/.gitignore b/internal/config/testdata/.gitignore similarity index 100% rename from config/testdata/.gitignore rename to internal/config/testdata/.gitignore diff --git a/config/testdata/config.toml b/internal/config/testdata/config.toml similarity index 100% rename from config/testdata/config.toml rename to internal/config/testdata/config.toml diff --git a/config/testdata/etc/.gitkeep b/internal/config/testdata/etc/.gitkeep similarity index 100% rename from config/testdata/etc/.gitkeep rename to internal/config/testdata/etc/.gitkeep diff --git a/slack/client.go b/internal/slack/client.go similarity index 100% rename from slack/client.go rename to internal/slack/client.go diff --git a/slack/client_test.go b/internal/slack/client_test.go similarity index 99% rename from slack/client_test.go rename to internal/slack/client_test.go index 3e8f1fa..5d9d884 100644 --- a/slack/client_test.go +++ b/internal/slack/client_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - . "github.com/catatsuy/notify_slack/slack" + . "github.com/catatsuy/notify_slack/internal/slack" ) func TestNewClient_badURL(t *testing.T) { diff --git a/slack/export_test.go b/internal/slack/export_test.go similarity index 100% rename from slack/export_test.go rename to internal/slack/export_test.go diff --git a/slack/testdata/post_files_upload_fail.json b/internal/slack/testdata/post_files_upload_fail.json similarity index 100% rename from slack/testdata/post_files_upload_fail.json rename to internal/slack/testdata/post_files_upload_fail.json diff --git a/slack/testdata/post_files_upload_ok.json b/internal/slack/testdata/post_files_upload_ok.json similarity index 100% rename from slack/testdata/post_files_upload_ok.json rename to internal/slack/testdata/post_files_upload_ok.json diff --git a/slack/testdata/post_text_fail.html b/internal/slack/testdata/post_text_fail.html similarity index 100% rename from slack/testdata/post_text_fail.html rename to internal/slack/testdata/post_text_fail.html diff --git a/slack/testdata/post_text_ok.html b/internal/slack/testdata/post_text_ok.html similarity index 100% rename from slack/testdata/post_text_ok.html rename to internal/slack/testdata/post_text_ok.html diff --git a/throttle/exec.go b/internal/throttle/exec.go similarity index 100% rename from throttle/exec.go rename to internal/throttle/exec.go diff --git a/throttle/exec_test.go b/internal/throttle/exec_test.go similarity index 100% rename from throttle/exec_test.go rename to internal/throttle/exec_test.go