internal to package for exportability

sapcc · May 4, 2024 · c489152 · c489152
1 parent e00d9b6
commit c489152
Show file tree

Hide file tree

Showing 29 changed files with 18 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 # build artifacts
 build/hermes
-.gopath/internal/
+.gopath/pkg/
 build/install/
 build/docker.tar
 

diff --git a/main.go b/main.go
@@ -30,10 +30,10 @@ import (
 	"github.com/sapcc/go-bits/osext"
 	"github.com/spf13/viper"
 
-	"github.com/sapcc/hermes/internal/api"
-	"github.com/sapcc/hermes/internal/identity"
-	"github.com/sapcc/hermes/internal/storage"
-	"github.com/sapcc/hermes/internal/util"
+	"github.com/sapcc/hermes/pkg/api"
+	"github.com/sapcc/hermes/pkg/identity"
+	"github.com/sapcc/hermes/pkg/storage"
+	"github.com/sapcc/hermes/pkg/util"
 )
 
 const version = "1.2.0"

diff --git a/internal/api/api_test.go → pkg/api/api_test.go b/internal/api/api_test.go → pkg/api/api_test.go
@@ -29,9 +29,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/viper"
 
-	"github.com/sapcc/hermes/internal/identity"
-	"github.com/sapcc/hermes/internal/storage"
-	"github.com/sapcc/hermes/internal/test"
+	"github.com/sapcc/hermes/pkg/identity"
+	"github.com/sapcc/hermes/pkg/storage"
+	"github.com/sapcc/hermes/pkg/test"
 )
 
 func setupTest(t *testing.T) http.Handler {

diff --git a/internal/api/core.go → pkg/api/core.go b/internal/api/core.go → pkg/api/core.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/sapcc/hermes/internal/identity"
-	"github.com/sapcc/hermes/internal/storage"
+	"github.com/sapcc/hermes/pkg/identity"
+	"github.com/sapcc/hermes/pkg/storage"
 )
 
 type v1Provider struct {

diff --git a/internal/api/events.go → pkg/api/events.go b/internal/api/events.go → pkg/api/events.go
@@ -33,7 +33,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sapcc/go-bits/logg"
 
-	"github.com/sapcc/hermes/internal/hermes"
+	"github.com/sapcc/hermes/pkg/hermes"
 )
 
 // EventList is the model for JSON returned by the ListEvents API call

diff --git a/internal/api/fixtures/api-metadata.json → pkg/api/fixtures/api-metadata.json b/internal/api/fixtures/api-metadata.json → pkg/api/fixtures/api-metadata.json
diff --git a/internal/api/fixtures/attributes.json → pkg/api/fixtures/attributes.json b/internal/api/fixtures/attributes.json → pkg/api/fixtures/attributes.json
diff --git a/internal/api/fixtures/event-details.json → pkg/api/fixtures/event-details.json b/internal/api/fixtures/event-details.json → pkg/api/fixtures/event-details.json
diff --git a/internal/api/fixtures/event-list.json → pkg/api/fixtures/event-list.json b/internal/api/fixtures/event-list.json → pkg/api/fixtures/event-list.json
diff --git a/internal/api/server.go → pkg/api/server.go b/internal/api/server.go → pkg/api/server.go
@@ -33,8 +33,8 @@ import (
 	"github.com/sapcc/go-bits/httpext"
 	"github.com/sapcc/go-bits/logg"
 
-	"github.com/sapcc/hermes/internal/identity"
-	"github.com/sapcc/hermes/internal/storage"
+	"github.com/sapcc/hermes/pkg/identity"
+	"github.com/sapcc/hermes/pkg/storage"
 )
 
 // Server Set up and start the API server, hooking it up to the API router

diff --git a/internal/api/token.go → pkg/api/token.go b/internal/api/token.go → pkg/api/token.go
diff --git a/internal/api/util.go → pkg/api/util.go b/internal/api/util.go → pkg/api/util.go
diff --git a/internal/hermes/events.go → pkg/hermes/events.go b/internal/hermes/events.go → pkg/hermes/events.go
@@ -26,8 +26,8 @@ import (
 	"github.com/sapcc/go-api-declarations/cadf"
 	"github.com/sapcc/go-bits/logg"
 
-	"github.com/sapcc/hermes/internal/identity"
-	"github.com/sapcc/hermes/internal/storage"
+	"github.com/sapcc/hermes/pkg/identity"
+	"github.com/sapcc/hermes/pkg/storage"
 )
 
 // ListEvent contains high-level data about an event, intended as a list item

diff --git a/internal/hermes/events_test.go → pkg/hermes/events_test.go b/internal/hermes/events_test.go → pkg/hermes/events_test.go
@@ -25,8 +25,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/sapcc/hermes/internal/identity"
-	"github.com/sapcc/hermes/internal/storage"
+	"github.com/sapcc/hermes/pkg/identity"
+	"github.com/sapcc/hermes/pkg/storage"
 )
 
 func Test_GetEvent(t *testing.T) {

diff --git a/internal/identity/interface.go → pkg/identity/interface.go b/internal/identity/interface.go → pkg/identity/interface.go
diff --git a/internal/identity/keystone.go → pkg/identity/keystone.go b/internal/identity/keystone.go → pkg/identity/keystone.go
diff --git a/internal/identity/keystone_cache.go → pkg/identity/keystone_cache.go b/internal/identity/keystone_cache.go → pkg/identity/keystone_cache.go
diff --git a/internal/identity/mock.go → pkg/identity/mock.go b/internal/identity/mock.go → pkg/identity/mock.go
diff --git a/internal/policy/policy_test.go → pkg/policy/policy_test.go b/internal/policy/policy_test.go → pkg/policy/policy_test.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/sapcc/go-bits/logg"
 
-	"github.com/sapcc/hermes/internal/util"
+	"github.com/sapcc/hermes/pkg/util"
 )
 
 // Setup test

diff --git a/internal/storage/elasticsearch.go → pkg/storage/elasticsearch.go b/internal/storage/elasticsearch.go → pkg/storage/elasticsearch.go
diff --git a/internal/storage/interface.go → pkg/storage/interface.go b/internal/storage/interface.go → pkg/storage/interface.go
diff --git a/internal/storage/mock.go → pkg/storage/mock.go b/internal/storage/mock.go → pkg/storage/mock.go
diff --git a/internal/storage/mock_test.go → pkg/storage/mock_test.go b/internal/storage/mock_test.go → pkg/storage/mock_test.go
diff --git a/internal/storage/util.go → pkg/storage/util.go b/internal/storage/util.go → pkg/storage/util.go
diff --git a/internal/storage/util_test.go → pkg/storage/util_test.go b/internal/storage/util_test.go → pkg/storage/util_test.go
diff --git a/internal/test/http.go → pkg/test/http.go b/internal/test/http.go → pkg/test/http.go
diff --git a/internal/test/policy.json → pkg/test/policy.json b/internal/test/policy.json → pkg/test/policy.json
diff --git a/internal/util/hacks.go → pkg/util/hacks.go b/internal/util/hacks.go → pkg/util/hacks.go
diff --git a/internal/util/load_policy.go → pkg/util/load_policy.go b/internal/util/load_policy.go → pkg/util/load_policy.go