rename pkg to internal

sapcc · Jan 31, 2023 · a7f3332 · a7f3332
1 parent c35d316
commit a7f3332
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,11 @@
 # build artifacts
 build/hermes
-.gopath/pkg/
+.gopath/internal/
 build/install/
 build/docker.tar
 
 # test artifacts
-pkg/test/migrations/*.sql
+internal/test/migrations/*.sql
 unittest.db
 build/cover.out
 build/*.cover.out

diff --git a/Dockerfile b/Dockerfile
@@ -4,14 +4,14 @@ RUN apk add --no-cache gcc git make musl-dev
 
 COPY . /src
 ARG BININFO_BUILD_DATE BININFO_COMMIT_HASH BININFO_VERSION # provided to 'make install'
-RUN make -C /src install PREFIX=/pkg
+RUN make -C /src install PREFIX=/internal
 
 ################################################################################
 
 FROM alpine:3.17
 
 RUN apk add --no-cache ca-certificates
-COPY --from=builder /pkg/ /usr/
+COPY --from=builder /internal/ /usr/
 
 ARG BININFO_BUILD_DATE BININFO_COMMIT_HASH BININFO_VERSION
 LABEL source_repository="https://github.com/sapcc/hermes" \

diff --git a/pkg/api/api_test.go → internal/api/api_test.go b/pkg/api/api_test.go → internal/api/api_test.go
@@ -29,9 +29,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/viper"
 
-	"github.com/sapcc/hermes/pkg/identity"
-	"github.com/sapcc/hermes/pkg/storage"
-	"github.com/sapcc/hermes/pkg/test"
+	"github.com/sapcc/hermes/internal/identity"
+	"github.com/sapcc/hermes/internal/storage"
+	"github.com/sapcc/hermes/internal/test"
 )
 
 //type object map[string]interface{} - unused re golangci

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

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

diff --git a/pkg/api/fixtures/api-metadata.json → internal/api/fixtures/api-metadata.json b/pkg/api/fixtures/api-metadata.json → internal/api/fixtures/api-metadata.json
diff --git a/pkg/api/fixtures/attributes.json → internal/api/fixtures/attributes.json b/pkg/api/fixtures/attributes.json → internal/api/fixtures/attributes.json
diff --git a/pkg/api/fixtures/event-details.json → internal/api/fixtures/event-details.json b/pkg/api/fixtures/event-details.json → internal/api/fixtures/event-details.json
diff --git a/pkg/api/fixtures/event-list.json → internal/api/fixtures/event-list.json b/pkg/api/fixtures/event-list.json → internal/api/fixtures/event-list.json
diff --git a/pkg/api/server.go → internal/api/server.go b/pkg/api/server.go → internal/api/server.go
@@ -28,9 +28,9 @@ import (
 	"github.com/rs/cors"
 	"github.com/spf13/viper"
 
-	"github.com/sapcc/hermes/pkg/identity"
-	"github.com/sapcc/hermes/pkg/storage"
-	"github.com/sapcc/hermes/pkg/util"
+	"github.com/sapcc/hermes/internal/identity"
+	"github.com/sapcc/hermes/internal/storage"
+	"github.com/sapcc/hermes/internal/util"
 )
 
 // Server Set up and start the API server, hooking it up to the API router

diff --git a/pkg/api/token.go → internal/api/token.go b/pkg/api/token.go → internal/api/token.go
@@ -30,7 +30,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/spf13/viper"
 
-	"github.com/sapcc/hermes/pkg/util"
+	"github.com/sapcc/hermes/internal/util"
 )
 
 // Token represents a user's token, as passed through the X-Auth-Token header of

diff --git a/pkg/api/util.go → internal/api/util.go b/pkg/api/util.go → internal/api/util.go
@@ -27,7 +27,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/sapcc/hermes/pkg/util"
+	"github.com/sapcc/hermes/internal/util"
 )
 
 // utility functionality

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

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

diff --git a/pkg/identity/interface.go → internal/identity/interface.go b/pkg/identity/interface.go → internal/identity/interface.go
diff --git a/pkg/identity/keystone.go → internal/identity/keystone.go b/pkg/identity/keystone.go → internal/identity/keystone.go
@@ -31,7 +31,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 
-	"github.com/sapcc/hermes/pkg/util"
+	"github.com/sapcc/hermes/internal/util"
 )
 
 // Keystone Openstack Keystone implementation

diff --git a/pkg/identity/keystone_cache.go → internal/identity/keystone_cache.go b/pkg/identity/keystone_cache.go → internal/identity/keystone_cache.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/gophercloud/gophercloud"
 
-	"github.com/sapcc/hermes/pkg/util"
+	"github.com/sapcc/hermes/internal/util"
 )
 
 // Cache type used for the name caches

diff --git a/pkg/identity/mock.go → internal/identity/mock.go b/pkg/identity/mock.go → internal/identity/mock.go
diff --git a/pkg/policy/policy_test.go → internal/policy/policy_test.go b/pkg/policy/policy_test.go → internal/policy/policy_test.go
@@ -28,7 +28,7 @@ import (
 	policy "github.com/databus23/goslo.policy"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/sapcc/hermes/pkg/util"
+	"github.com/sapcc/hermes/internal/util"
 )
 
 // Setup test

diff --git a/pkg/storage/elasticsearch.go → internal/storage/elasticsearch.go b/pkg/storage/elasticsearch.go → internal/storage/elasticsearch.go
@@ -30,7 +30,7 @@ import (
 	"github.com/sapcc/go-api-declarations/cadf"
 	"github.com/spf13/viper"
 
-	"github.com/sapcc/hermes/pkg/util"
+	"github.com/sapcc/hermes/internal/util"
 )
 
 // ElasticSearch contains an elastic.Client we pass around after init.

diff --git a/pkg/storage/interface.go → internal/storage/interface.go b/pkg/storage/interface.go → internal/storage/interface.go
diff --git a/pkg/storage/mock.go → internal/storage/mock.go b/pkg/storage/mock.go → internal/storage/mock.go
diff --git a/pkg/storage/mock_test.go → internal/storage/mock_test.go b/pkg/storage/mock_test.go → internal/storage/mock_test.go
diff --git a/pkg/test/http.go → internal/test/http.go b/pkg/test/http.go → internal/test/http.go
diff --git a/pkg/test/policy.json → internal/test/policy.json b/pkg/test/policy.json → internal/test/policy.json
diff --git a/pkg/util/hacks.go → internal/util/hacks.go b/pkg/util/hacks.go → internal/util/hacks.go
diff --git a/pkg/util/load_policy.go → internal/util/load_policy.go b/pkg/util/load_policy.go → internal/util/load_policy.go
diff --git a/pkg/util/log.go → internal/util/log.go b/pkg/util/log.go → internal/util/log.go
diff --git a/main.go b/main.go
@@ -29,10 +29,10 @@ import (
 	policy "github.com/databus23/goslo.policy"
 	"github.com/spf13/viper"
 
-	"github.com/sapcc/hermes/pkg/api"
-	"github.com/sapcc/hermes/pkg/identity"
-	"github.com/sapcc/hermes/pkg/storage"
-	"github.com/sapcc/hermes/pkg/util"
+	"github.com/sapcc/hermes/internal/api"
+	"github.com/sapcc/hermes/internal/identity"
+	"github.com/sapcc/hermes/internal/storage"
+	"github.com/sapcc/hermes/internal/util"
 )
 
 var configPath *string