Moving all non-public packages to internal (#401)

Signed-off-by: Eder Ignatowicz <[email protected]>
kubeflow · Sep 23, 2024 · 5eb1166 · 5eb1166
1 parent dde9afb
commit 5eb1166
Show file tree

Hide file tree

Showing 38 changed files with 30 additions and 36 deletions.
diff --git a/clients/ui/bff/Dockerfile b/clients/ui/bff/Dockerfile
@@ -12,13 +12,8 @@ COPY go.mod go.sum ./
 RUN go mod download
 
 # Copy the go source files
-COPY cmd/ cmd/
-COPY api/ api/
-COPY config/ config/
-COPY data/ data/
-COPY integrations/ integrations/
-COPY internals/ internals/
-COPY validation/ validation/
+COPY cmd/main.go cmd/main.go
+COPY internal/ internal/
 
 
 

diff --git a/clients/ui/bff/cmd/main.go b/clients/ui/bff/cmd/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/kubeflow/model-registry/ui/bff/api"
-	"github.com/kubeflow/model-registry/ui/bff/config"
+	"github.com/kubeflow/model-registry/ui/bff/internal/api"
+	"github.com/kubeflow/model-registry/ui/bff/internal/config"
 
 	"log/slog"
 	"net/http"

diff --git a/clients/ui/bff/api/app.go → clients/ui/bff/internal/api/app.go b/clients/ui/bff/api/app.go → clients/ui/bff/internal/api/app.go
@@ -2,14 +2,14 @@ package api
 
 import (
 	"fmt"
+	"github.com/kubeflow/model-registry/ui/bff/internal/config"
+	"github.com/kubeflow/model-registry/ui/bff/internal/data"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 	"log/slog"
 	"net/http"
 
 	"github.com/julienschmidt/httprouter"
-	"github.com/kubeflow/model-registry/ui/bff/config"
-	"github.com/kubeflow/model-registry/ui/bff/data"
-	"github.com/kubeflow/model-registry/ui/bff/integrations"
-	"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 )
 
 const (

diff --git a/clients/ui/bff/api/errors.go → clients/ui/bff/internal/api/errors.go b/clients/ui/bff/api/errors.go → clients/ui/bff/internal/api/errors.go
@@ -3,7 +3,7 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/kubeflow/model-registry/ui/bff/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 	"net/http"
 	"strconv"
 )

diff --git a/...s/ui/bff/api/healthcheck__handler_test.go → ...internal/api/healthcheck__handler_test.go b/...s/ui/bff/api/healthcheck__handler_test.go → ...internal/api/healthcheck__handler_test.go
@@ -2,8 +2,8 @@ package api
 
 import (
 	"encoding/json"
-	"github.com/kubeflow/model-registry/ui/bff/config"
-	"github.com/kubeflow/model-registry/ui/bff/data"
+	"github.com/kubeflow/model-registry/ui/bff/internal/config"
+	"github.com/kubeflow/model-registry/ui/bff/internal/data"
 	"github.com/stretchr/testify/assert"
 	"io"
 	"net/http"

diff --git a/clients/ui/bff/api/healthcheck_handler.go → ...i/bff/internal/api/healthcheck_handler.go b/clients/ui/bff/api/healthcheck_handler.go → ...i/bff/internal/api/healthcheck_handler.go
diff --git a/clients/ui/bff/api/helpers.go → clients/ui/bff/internal/api/helpers.go b/clients/ui/bff/api/helpers.go → clients/ui/bff/internal/api/helpers.go
diff --git a/clients/ui/bff/api/helpers_test.go → clients/ui/bff/internal/api/helpers_test.go b/clients/ui/bff/api/helpers_test.go → clients/ui/bff/internal/api/helpers_test.go
diff --git a/clients/ui/bff/api/middleware.go → clients/ui/bff/internal/api/middleware.go b/clients/ui/bff/api/middleware.go → clients/ui/bff/internal/api/middleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/julienschmidt/httprouter"
-	"github.com/kubeflow/model-registry/ui/bff/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 	"k8s.io/client-go/rest"
 	"net/http"
 )

diff --git a/clients/ui/bff/api/model_registry_handler.go → ...ff/internal/api/model_registry_handler.go b/clients/ui/bff/api/model_registry_handler.go → ...ff/internal/api/model_registry_handler.go
@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/julienschmidt/httprouter"
-	"github.com/kubeflow/model-registry/ui/bff/data"
+	"github.com/kubeflow/model-registry/ui/bff/internal/data"
 	"net/http"
 )
 

diff --git a/...ui/bff/api/model_registry_handler_test.go → ...ternal/api/model_registry_handler_test.go b/...ui/bff/api/model_registry_handler_test.go → ...ternal/api/model_registry_handler_test.go
@@ -2,8 +2,8 @@ package api
 
 import (
 	"encoding/json"
-	"github.com/kubeflow/model-registry/ui/bff/data"
-	"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
+	"github.com/kubeflow/model-registry/ui/bff/internal/data"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 	"github.com/stretchr/testify/assert"
 	"io"
 	"net/http"

diff --git a/clients/ui/bff/api/model_versions_handler.go → ...ff/internal/api/model_versions_handler.go b/clients/ui/bff/api/model_versions_handler.go → ...ff/internal/api/model_versions_handler.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"github.com/julienschmidt/httprouter"
 	"github.com/kubeflow/model-registry/pkg/openapi"
-	"github.com/kubeflow/model-registry/ui/bff/integrations"
-	"github.com/kubeflow/model-registry/ui/bff/validation"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/validation"
 	"net/http"
 )
 

diff --git a/...ui/bff/api/model_versions_handler_test.go → ...ternal/api/model_versions_handler_test.go b/...ui/bff/api/model_versions_handler_test.go → ...ternal/api/model_versions_handler_test.go
@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/kubeflow/model-registry/pkg/openapi"
-	"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"

diff --git a/...s/ui/bff/api/registered_models_handler.go → ...internal/api/registered_models_handler.go b/...s/ui/bff/api/registered_models_handler.go → ...internal/api/registered_models_handler.go
@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/validation"
 	"net/http"
 
 	"github.com/julienschmidt/httprouter"
 	"github.com/kubeflow/model-registry/pkg/openapi"
-	"github.com/kubeflow/model-registry/ui/bff/integrations"
-	"github.com/kubeflow/model-registry/ui/bff/validation"
 )
 
 type RegisteredModelEnvelope Envelope[*openapi.RegisteredModel, None]

diff --git a/...bff/api/registered_models_handler_test.go → ...nal/api/registered_models_handler_test.go b/...bff/api/registered_models_handler_test.go → ...nal/api/registered_models_handler_test.go
@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/kubeflow/model-registry/pkg/openapi"
-	"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"

diff --git a/clients/ui/bff/api/test_utils.go → clients/ui/bff/internal/api/test_utils.go b/clients/ui/bff/api/test_utils.go → clients/ui/bff/internal/api/test_utils.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 	"io"
 	"net/http"
 	"net/http/httptest"

diff --git a/clients/ui/bff/config/environment.go → ...nts/ui/bff/internal/config/environment.go b/clients/ui/bff/config/environment.go → ...nts/ui/bff/internal/config/environment.go
diff --git a/clients/ui/bff/data/health_check_model.go → ...i/bff/internal/data/health_check_model.go b/clients/ui/bff/data/health_check_model.go → ...i/bff/internal/data/health_check_model.go
diff --git a/clients/ui/bff/data/model_registry.go → ...ts/ui/bff/internal/data/model_registry.go b/clients/ui/bff/data/model_registry.go → ...ts/ui/bff/internal/data/model_registry.go
@@ -2,8 +2,7 @@ package data
 
 import (
 	"fmt"
-
-	k8s "github.com/kubeflow/model-registry/ui/bff/integrations"
+	k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 )
 
 type ModelRegistryModel struct {

diff --git a/clients/ui/bff/data/model_registry_client.go → ...ff/internal/data/model_registry_client.go b/clients/ui/bff/data/model_registry_client.go → ...ff/internal/data/model_registry_client.go
diff --git a/clients/ui/bff/data/model_registry_test.go → .../bff/internal/data/model_registry_test.go b/clients/ui/bff/data/model_registry_test.go → .../bff/internal/data/model_registry_test.go
@@ -1,7 +1,7 @@
 package data
 
 import (
-	"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

diff --git a/clients/ui/bff/data/model_version.go → ...nts/ui/bff/internal/data/model_version.go b/clients/ui/bff/data/model_version.go → ...nts/ui/bff/internal/data/model_version.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/kubeflow/model-registry/pkg/openapi"
-	"github.com/kubeflow/model-registry/ui/bff/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 	"net/url"
 )
 

diff --git a/clients/ui/bff/data/model_version_test.go → ...i/bff/internal/data/model_version_test.go b/clients/ui/bff/data/model_version_test.go → ...i/bff/internal/data/model_version_test.go
@@ -3,7 +3,7 @@ package data
 import (
 	"encoding/json"
 	"github.com/brianvoe/gofakeit/v7"
-	"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"net/http"

diff --git a/clients/ui/bff/data/models.go → clients/ui/bff/internal/data/models.go b/clients/ui/bff/data/models.go → clients/ui/bff/internal/data/models.go
diff --git a/clients/ui/bff/data/registered_model.go → .../ui/bff/internal/data/registered_model.go b/clients/ui/bff/data/registered_model.go → .../ui/bff/internal/data/registered_model.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/kubeflow/model-registry/pkg/openapi"
-	"github.com/kubeflow/model-registry/ui/bff/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 	"net/url"
 )
 

diff --git a/clients/ui/bff/data/registered_model_test.go → ...ff/internal/data/registered_model_test.go b/clients/ui/bff/data/registered_model_test.go → ...ff/internal/data/registered_model_test.go
@@ -3,7 +3,7 @@ package data
 import (
 	"encoding/json"
 	"github.com/brianvoe/gofakeit/v7"
-	"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"net/http"

diff --git a/clients/ui/bff/integrations/constants.go → ...ui/bff/internal/integrations/constants.go b/clients/ui/bff/integrations/constants.go → ...ui/bff/internal/integrations/constants.go
diff --git a/clients/ui/bff/integrations/http.go → clients/ui/bff/internal/integrations/http.go b/clients/ui/bff/integrations/http.go → clients/ui/bff/internal/integrations/http.go
diff --git a/clients/ui/bff/integrations/k8s.go → clients/ui/bff/internal/integrations/k8s.go b/clients/ui/bff/integrations/k8s.go → clients/ui/bff/internal/integrations/k8s.go
diff --git a/clients/ui/bff/integrations/k8s_test.go → .../ui/bff/internal/integrations/k8s_test.go b/clients/ui/bff/integrations/k8s_test.go → .../ui/bff/internal/integrations/k8s_test.go
diff --git a/clients/ui/bff/internals/mocks/http_mock.go → clients/ui/bff/internal/mocks/http_mock.go b/clients/ui/bff/internals/mocks/http_mock.go → clients/ui/bff/internal/mocks/http_mock.go
diff --git a/clients/ui/bff/internals/mocks/k8s_mock.go → clients/ui/bff/internal/mocks/k8s_mock.go b/clients/ui/bff/internals/mocks/k8s_mock.go → clients/ui/bff/internal/mocks/k8s_mock.go
@@ -1,7 +1,7 @@
 package mocks
 
 import (
-	k8s "github.com/kubeflow/model-registry/ui/bff/integrations"
+	k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 	"github.com/stretchr/testify/mock"
 	"log/slog"
 )

diff --git a/...rnals/mocks/model_registry_client_mock.go → ...ernal/mocks/model_registry_client_mock.go b/...rnals/mocks/model_registry_client_mock.go → ...ernal/mocks/model_registry_client_mock.go
@@ -2,7 +2,7 @@ package mocks
 
 import (
 	"github.com/kubeflow/model-registry/pkg/openapi"
-	"github.com/kubeflow/model-registry/ui/bff/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 	"github.com/stretchr/testify/mock"
 	"log/slog"
 )

diff --git a/...i/bff/internals/mocks/static_data_mock.go → ...ui/bff/internal/mocks/static_data_mock.go b/...i/bff/internals/mocks/static_data_mock.go → ...ui/bff/internal/mocks/static_data_mock.go
diff --git a/clients/ui/bff/internals/mocks/types_mock.go → clients/ui/bff/internal/mocks/types_mock.go b/clients/ui/bff/internals/mocks/types_mock.go → clients/ui/bff/internal/mocks/types_mock.go
diff --git a/clients/ui/bff/validation/test_helpers.go → ...i/bff/internal/validation/test_helpers.go b/clients/ui/bff/validation/test_helpers.go → ...i/bff/internal/validation/test_helpers.go
diff --git a/clients/ui/bff/validation/validation.go → .../ui/bff/internal/validation/validation.go b/clients/ui/bff/validation/validation.go → .../ui/bff/internal/validation/validation.go
diff --git a/clients/ui/bff/validation/validation_test.go → ...ff/internal/validation/validation_test.go b/clients/ui/bff/validation/validation_test.go → ...ff/internal/validation/validation_test.go