Internal Refactor: "./internal" -> "./pkg"

The renaming of the "internal" folder helps of keeping various parts of Makefile and GH Actions streamlined with other projects.
mgumz · Mar 12, 2023 · 70261f7 · 70261f7
1 parent cb56763
commit 70261f7
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml
@@ -23,7 +23,7 @@ jobs:
     - uses: WillAbides/[email protected]
       with:
         go-version: ${{ matrix.go }}
-    - run: "go test ./internal/..."
+    - run: "go test ./pkg/..."
 
   reports:
     name: "Run various reports on code basis"

diff --git a/Makefile b/Makefile
@@ -67,25 +67,24 @@ report-cyclo:
 	@echo '####################################################################'
 	gocyclo ./cmd/cciu
 report-mispell:
-	@echo '####################################################################'
-	misspell ./cmd/
+
 report-ineffassign:
 	@echo '####################################################################'
-	ineffassign ./cmd/... ./internal/...
+	ineffassign ./cmd/... ./pkg/...
 report-vet:
 	@echo '####################################################################'
-	go vet ./cmd/... ./internal/...
+	go vet ./cmd/... ./pkg/...
 report-staticcheck:
 	@echo '####################################################################'
-	staticcheck ./cmd/... ./internal/...
+	staticcheck ./cmd/... ./pkg/...
 
 report-vuln:
 	@echo '####################################################################'
-	govulncheck ./...
+	govulncheck ./cmd/... ./pkg/...
 
 report-gosec:
 	@echo '####################################################################'
-	gosec ./...
+	gosec ./cmd/... ./pkg/...
 
 report-grype:
 	@echo '####################################################################'

diff --git a/cmd/cciu/filter.go b/cmd/cciu/filter.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"github.com/mgumz/cciu/internal/tag"
+	"github.com/mgumz/cciu/pkg/tag"
 )
 
 const (

diff --git a/cmd/cciu/main.go b/cmd/cciu/main.go
@@ -9,12 +9,12 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"github.com/mgumz/cciu/internal/imagespec"
-	"github.com/mgumz/cciu/internal/printer"
-	"github.com/mgumz/cciu/internal/registry"
-	"github.com/mgumz/cciu/internal/registry/fetcher"
-	"github.com/mgumz/cciu/internal/stats"
-	"github.com/mgumz/cciu/internal/tag"
+	"github.com/mgumz/cciu/pkg/imagespec"
+	"github.com/mgumz/cciu/pkg/printer"
+	"github.com/mgumz/cciu/pkg/registry"
+	"github.com/mgumz/cciu/pkg/registry/fetcher"
+	"github.com/mgumz/cciu/pkg/stats"
+	"github.com/mgumz/cciu/pkg/tag"
 )
 
 type cciuRepoTags struct {

diff --git a/internal/imagespec/imagespec.go → pkg/imagespec/imagespec.go b/internal/imagespec/imagespec.go → pkg/imagespec/imagespec.go
diff --git a/internal/imagespec/normalize.go → pkg/imagespec/normalize.go b/internal/imagespec/normalize.go → pkg/imagespec/normalize.go
diff --git a/internal/imagespec/normalize_test.go → pkg/imagespec/normalize_test.go b/internal/imagespec/normalize_test.go → pkg/imagespec/normalize_test.go
diff --git a/internal/imagespec/split.go → pkg/imagespec/split.go b/internal/imagespec/split.go → pkg/imagespec/split.go
diff --git a/internal/imagespec/split_test.go → pkg/imagespec/split_test.go b/internal/imagespec/split_test.go → pkg/imagespec/split_test.go
diff --git a/internal/printer/json_printer.go → pkg/printer/json_printer.go b/internal/printer/json_printer.go → pkg/printer/json_printer.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"github.com/mgumz/cciu/internal/stats"
+	"github.com/mgumz/cciu/pkg/stats"
 )
 
 // JSONPrinter collects the requested images, the fetched tags and creates

diff --git a/internal/printer/printer.go → pkg/printer/printer.go b/internal/printer/printer.go → pkg/printer/printer.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"github.com/mgumz/cciu/internal/stats"
+	"github.com/mgumz/cciu/pkg/stats"
 )
 
 // Printer describes the interface for a cciu printer - a helper for controlled

diff --git a/internal/printer/text_printer.go → pkg/printer/text_printer.go b/internal/printer/text_printer.go → pkg/printer/text_printer.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"github.com/mgumz/cciu/internal/stats"
+	"github.com/mgumz/cciu/pkg/stats"
 )
 
 const (

diff --git a/internal/registry/fetcher/per_registry.go → pkg/registry/fetcher/per_registry.go b/internal/registry/fetcher/per_registry.go → pkg/registry/fetcher/per_registry.go
diff --git a/internal/registry/fetcher/simple.go → pkg/registry/fetcher/simple.go b/internal/registry/fetcher/simple.go → pkg/registry/fetcher/simple.go
@@ -3,7 +3,7 @@ package fetcher
 import (
 	"time"
 
-	"github.com/mgumz/cciu/internal/repo"
+	"github.com/mgumz/cciu/pkg/repo"
 )
 
 // Simple defines a simple registry.Fetcher which is just a tiny wrapper around

diff --git a/internal/registry/registry.go → pkg/registry/registry.go b/internal/registry/registry.go → pkg/registry/registry.go
diff --git a/internal/repo/fetch.go → pkg/repo/fetch.go b/internal/repo/fetch.go → pkg/repo/fetch.go
diff --git a/internal/repo/repo.go → pkg/repo/repo.go b/internal/repo/repo.go → pkg/repo/repo.go
diff --git a/internal/stats/stats.go → pkg/stats/stats.go b/internal/stats/stats.go → pkg/stats/stats.go
diff --git a/internal/tag/filter.go → pkg/tag/filter.go b/internal/tag/filter.go → pkg/tag/filter.go
diff --git a/internal/tag/tags.go → pkg/tag/tags.go b/internal/tag/tags.go → pkg/tag/tags.go
diff --git a/internal/tag/tags_test.go → pkg/tag/tags_test.go b/internal/tag/tags_test.go → pkg/tag/tags_test.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"github.com/Masterminds/semver/v3"
-    	"github.com/mgumz/cciu/internal/tag"
+    	"github.com/mgumz/cciu/pkg/tag"
     )
     const (
@@ Expand Down @@