diff --git a/cmd/admin/admin.go b/cmd/admin/admin.go index 20a64cef..381b8012 100644 --- a/cmd/admin/admin.go +++ b/cmd/admin/admin.go @@ -2,12 +2,12 @@ package main import ( "fmt" + "github.com/hexa-org/policy-orchestrator/internal/admin" "log" "net" "net/http" "os" - "github.com/hexa-org/policy-orchestrator/pkg/admin" "github.com/hexa-org/policy-orchestrator/pkg/websupport" ) diff --git a/cmd/demo/demo.go b/cmd/demo/demo.go index cbd31efa..22542d74 100644 --- a/cmd/demo/demo.go +++ b/cmd/demo/demo.go @@ -3,6 +3,8 @@ package main import ( "embed" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/decisionsupport" + "github.com/hexa-org/policy-orchestrator/internal/decisionsupportproviders" "log" "net" "net/http" @@ -15,8 +17,6 @@ import ( "github.com/hexa-org/policy-orchestrator/cmd/demo/amazonsupport" "github.com/hexa-org/policy-orchestrator/cmd/demo/azuresupport" "github.com/hexa-org/policy-orchestrator/cmd/demo/googlesupport" - "github.com/hexa-org/policy-orchestrator/pkg/decisionsupport" - "github.com/hexa-org/policy-orchestrator/pkg/decisionsupportproviders" "github.com/hexa-org/policy-orchestrator/pkg/websupport" ) diff --git a/cmd/democonfig/democonfig.go b/cmd/democonfig/democonfig.go index b6ae788a..ca76864f 100644 --- a/cmd/democonfig/democonfig.go +++ b/cmd/democonfig/democonfig.go @@ -4,6 +4,7 @@ import ( "bytes" "crypto/tls" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/compressionsupport" "io/fs" "log" "math/rand" @@ -17,7 +18,6 @@ import ( "time" "github.com/gorilla/mux" - "github.com/hexa-org/policy-orchestrator/pkg/compressionsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" ) diff --git a/cmd/democonfig/democonfig_test.go b/cmd/democonfig/democonfig_test.go index a63dc537..0e62180d 100644 --- a/cmd/democonfig/democonfig_test.go +++ b/cmd/democonfig/democonfig_test.go @@ -5,6 +5,7 @@ import ( "crypto/tls" "crypto/x509" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/compressionsupport" "mime/multipart" "net" "net/http" @@ -14,7 +15,6 @@ import ( "testing" "time" - "github.com/hexa-org/policy-orchestrator/pkg/compressionsupport" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" diff --git a/cmd/orchestrator/orchestrator.go b/cmd/orchestrator/orchestrator.go index 018209bc..34388e1d 100644 --- a/cmd/orchestrator/orchestrator.go +++ b/cmd/orchestrator/orchestrator.go @@ -4,6 +4,11 @@ import ( "crypto/tls" "database/sql" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/amazonwebservices" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/googlecloud" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/microsoftazure" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/openpolicyagent" "log" "net" "net/http" @@ -12,11 +17,6 @@ import ( "github.com/hexa-org/policy-orchestrator/pkg/databasesupport" "github.com/hexa-org/policy-orchestrator/pkg/hawksupport" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/amazonwebservices" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/googlecloud" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/microsoftazure" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/openpolicyagent" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/hexa-org/policy-orchestrator/pkg/workflowsupport" ) diff --git a/pkg/admin/admin.go b/internal/admin/admin.go similarity index 100% rename from pkg/admin/admin.go rename to internal/admin/admin.go diff --git a/pkg/admin/admin_test.go b/internal/admin/admin_test.go similarity index 89% rename from pkg/admin/admin_test.go rename to internal/admin/admin_test.go index a89edcd2..9bb266c1 100644 --- a/pkg/admin/admin_test.go +++ b/internal/admin/admin_test.go @@ -2,12 +2,12 @@ package admin_test import ( "fmt" + "github.com/hexa-org/policy-orchestrator/internal/admin" + "github.com/hexa-org/policy-orchestrator/internal/admin/test" "net" "net/http" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/admin" - "github.com/hexa-org/policy-orchestrator/pkg/admin/test" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" diff --git a/pkg/admin/applications.go b/internal/admin/applications.go similarity index 100% rename from pkg/admin/applications.go rename to internal/admin/applications.go diff --git a/pkg/admin/applications_test.go b/internal/admin/applications_test.go similarity index 98% rename from pkg/admin/applications_test.go rename to internal/admin/applications_test.go index 46873868..35f2ecf3 100644 --- a/pkg/admin/applications_test.go +++ b/internal/admin/applications_test.go @@ -3,13 +3,13 @@ package admin_test import ( "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/admin" + "github.com/hexa-org/policy-orchestrator/internal/admin/test" "io" "net" "net/http" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/admin" - admin_test "github.com/hexa-org/policy-orchestrator/pkg/admin/test" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" diff --git a/pkg/admin/integrations.go b/internal/admin/integrations.go similarity index 100% rename from pkg/admin/integrations.go rename to internal/admin/integrations.go diff --git a/pkg/admin/integrations_amazon.go b/internal/admin/integrations_amazon.go similarity index 100% rename from pkg/admin/integrations_amazon.go rename to internal/admin/integrations_amazon.go diff --git a/pkg/admin/integrations_azure.go b/internal/admin/integrations_azure.go similarity index 100% rename from pkg/admin/integrations_azure.go rename to internal/admin/integrations_azure.go diff --git a/pkg/admin/integrations_google.go b/internal/admin/integrations_google.go similarity index 100% rename from pkg/admin/integrations_google.go rename to internal/admin/integrations_google.go diff --git a/pkg/admin/integrations_open_policy.go b/internal/admin/integrations_open_policy.go similarity index 100% rename from pkg/admin/integrations_open_policy.go rename to internal/admin/integrations_open_policy.go diff --git a/pkg/admin/integrations_test.go b/internal/admin/integrations_test.go similarity index 98% rename from pkg/admin/integrations_test.go rename to internal/admin/integrations_test.go index e37fd56f..889f6daf 100644 --- a/pkg/admin/integrations_test.go +++ b/internal/admin/integrations_test.go @@ -4,6 +4,8 @@ import ( "bytes" "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/admin" + "github.com/hexa-org/policy-orchestrator/internal/admin/test" "io" "mime/multipart" "net" @@ -11,8 +13,6 @@ import ( "net/url" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/admin" - "github.com/hexa-org/policy-orchestrator/pkg/admin/test" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" diff --git a/pkg/admin/orchestration.go b/internal/admin/orchestration.go similarity index 100% rename from pkg/admin/orchestration.go rename to internal/admin/orchestration.go diff --git a/pkg/admin/orchestration_test.go b/internal/admin/orchestration_test.go similarity index 95% rename from pkg/admin/orchestration_test.go rename to internal/admin/orchestration_test.go index 7e59af58..61644b05 100644 --- a/pkg/admin/orchestration_test.go +++ b/internal/admin/orchestration_test.go @@ -3,13 +3,13 @@ package admin_test import ( "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/admin" + "github.com/hexa-org/policy-orchestrator/internal/admin/test" "io" "net" "net/http" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/admin" - "github.com/hexa-org/policy-orchestrator/pkg/admin/test" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" diff --git a/pkg/admin/orchestrator_client.go b/internal/admin/orchestrator_client.go similarity index 100% rename from pkg/admin/orchestrator_client.go rename to internal/admin/orchestrator_client.go diff --git a/pkg/admin/orchestrator_client_test.go b/internal/admin/orchestrator_client_test.go similarity index 99% rename from pkg/admin/orchestrator_client_test.go rename to internal/admin/orchestrator_client_test.go index 01102839..ed72b0cb 100644 --- a/pkg/admin/orchestrator_client_test.go +++ b/internal/admin/orchestrator_client_test.go @@ -5,12 +5,12 @@ import ( "encoding/base64" "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/admin" "io/ioutil" "net/http" "testing" "github.com/go-playground/validator/v10" - "github.com/hexa-org/policy-orchestrator/pkg/admin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/admin/resources/static/images/add_white.svg b/internal/admin/resources/static/images/add_white.svg similarity index 100% rename from pkg/admin/resources/static/images/add_white.svg rename to internal/admin/resources/static/images/add_white.svg diff --git a/pkg/admin/resources/static/images/edit_white.svg b/internal/admin/resources/static/images/edit_white.svg similarity index 100% rename from pkg/admin/resources/static/images/edit_white.svg rename to internal/admin/resources/static/images/edit_white.svg diff --git a/pkg/admin/resources/static/images/favicon.png b/internal/admin/resources/static/images/favicon.png similarity index 100% rename from pkg/admin/resources/static/images/favicon.png rename to internal/admin/resources/static/images/favicon.png diff --git a/pkg/admin/resources/static/images/hexa.svg b/internal/admin/resources/static/images/hexa.svg similarity index 100% rename from pkg/admin/resources/static/images/hexa.svg rename to internal/admin/resources/static/images/hexa.svg diff --git a/pkg/admin/resources/static/images/menu_white.svg b/internal/admin/resources/static/images/menu_white.svg similarity index 100% rename from pkg/admin/resources/static/images/menu_white.svg rename to internal/admin/resources/static/images/menu_white.svg diff --git a/pkg/admin/resources/static/styles/app.css b/internal/admin/resources/static/styles/app.css similarity index 100% rename from pkg/admin/resources/static/styles/app.css rename to internal/admin/resources/static/styles/app.css diff --git a/pkg/admin/resources/static/styles/reset.css b/internal/admin/resources/static/styles/reset.css similarity index 100% rename from pkg/admin/resources/static/styles/reset.css rename to internal/admin/resources/static/styles/reset.css diff --git a/pkg/admin/resources/templates/applications.gohtml b/internal/admin/resources/templates/applications.gohtml similarity index 100% rename from pkg/admin/resources/templates/applications.gohtml rename to internal/admin/resources/templates/applications.gohtml diff --git a/pkg/admin/resources/templates/applications_edit.gohtml b/internal/admin/resources/templates/applications_edit.gohtml similarity index 100% rename from pkg/admin/resources/templates/applications_edit.gohtml rename to internal/admin/resources/templates/applications_edit.gohtml diff --git a/pkg/admin/resources/templates/applications_show.gohtml b/internal/admin/resources/templates/applications_show.gohtml similarity index 100% rename from pkg/admin/resources/templates/applications_show.gohtml rename to internal/admin/resources/templates/applications_show.gohtml diff --git a/pkg/admin/resources/templates/integrations.gohtml b/internal/admin/resources/templates/integrations.gohtml similarity index 100% rename from pkg/admin/resources/templates/integrations.gohtml rename to internal/admin/resources/templates/integrations.gohtml diff --git a/pkg/admin/resources/templates/integrations_new_amazon.gohtml b/internal/admin/resources/templates/integrations_new_amazon.gohtml similarity index 100% rename from pkg/admin/resources/templates/integrations_new_amazon.gohtml rename to internal/admin/resources/templates/integrations_new_amazon.gohtml diff --git a/pkg/admin/resources/templates/integrations_new_azure.gohtml b/internal/admin/resources/templates/integrations_new_azure.gohtml similarity index 100% rename from pkg/admin/resources/templates/integrations_new_azure.gohtml rename to internal/admin/resources/templates/integrations_new_azure.gohtml diff --git a/pkg/admin/resources/templates/integrations_new_google_cloud.gohtml b/internal/admin/resources/templates/integrations_new_google_cloud.gohtml similarity index 100% rename from pkg/admin/resources/templates/integrations_new_google_cloud.gohtml rename to internal/admin/resources/templates/integrations_new_google_cloud.gohtml diff --git a/pkg/admin/resources/templates/integrations_new_open_policy.gohtml b/internal/admin/resources/templates/integrations_new_open_policy.gohtml similarity index 100% rename from pkg/admin/resources/templates/integrations_new_open_policy.gohtml rename to internal/admin/resources/templates/integrations_new_open_policy.gohtml diff --git a/pkg/admin/resources/templates/orchestration_new.gohtml b/internal/admin/resources/templates/orchestration_new.gohtml similarity index 100% rename from pkg/admin/resources/templates/orchestration_new.gohtml rename to internal/admin/resources/templates/orchestration_new.gohtml diff --git a/pkg/admin/resources/templates/status.gohtml b/internal/admin/resources/templates/status.gohtml similarity index 100% rename from pkg/admin/resources/templates/status.gohtml rename to internal/admin/resources/templates/status.gohtml diff --git a/pkg/admin/resources/templates/template.gohtml b/internal/admin/resources/templates/template.gohtml similarity index 100% rename from pkg/admin/resources/templates/template.gohtml rename to internal/admin/resources/templates/template.gohtml diff --git a/pkg/admin/status.go b/internal/admin/status.go similarity index 100% rename from pkg/admin/status.go rename to internal/admin/status.go diff --git a/pkg/admin/status_test.go b/internal/admin/status_test.go similarity index 93% rename from pkg/admin/status_test.go rename to internal/admin/status_test.go index 39f1628a..66a879e4 100644 --- a/pkg/admin/status_test.go +++ b/internal/admin/status_test.go @@ -2,14 +2,14 @@ package admin_test import ( "fmt" + "github.com/hexa-org/policy-orchestrator/internal/admin" + "github.com/hexa-org/policy-orchestrator/internal/admin/test" "io" "net" "net/http" "testing" "github.com/gorilla/mux" - "github.com/hexa-org/policy-orchestrator/pkg/admin" - "github.com/hexa-org/policy-orchestrator/pkg/admin/test" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" diff --git a/pkg/admin/test/mock_client.go b/internal/admin/test/mock_client.go similarity index 97% rename from pkg/admin/test/mock_client.go rename to internal/admin/test/mock_client.go index 1f9e7d15..5118e9a5 100644 --- a/pkg/admin/test/mock_client.go +++ b/internal/admin/test/mock_client.go @@ -2,8 +2,8 @@ package admin_test import ( "fmt" + "github.com/hexa-org/policy-orchestrator/internal/admin" - "github.com/hexa-org/policy-orchestrator/pkg/admin" "github.com/stretchr/testify/mock" ) diff --git a/pkg/compressionsupport/compress.go b/internal/compressionsupport/compress.go similarity index 100% rename from pkg/compressionsupport/compress.go rename to internal/compressionsupport/compress.go diff --git a/pkg/compressionsupport/compress_test.go b/internal/compressionsupport/compress_test.go similarity index 96% rename from pkg/compressionsupport/compress_test.go rename to internal/compressionsupport/compress_test.go index 0ce8bee1..aee5baae 100644 --- a/pkg/compressionsupport/compress_test.go +++ b/internal/compressionsupport/compress_test.go @@ -2,12 +2,12 @@ package compressionsupport_test import ( "bytes" + "github.com/hexa-org/policy-orchestrator/internal/compressionsupport" "os" "path/filepath" "runtime" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/compressionsupport" "github.com/stretchr/testify/assert" ) diff --git a/pkg/compressionsupport/resources/compressdir/.manifest b/internal/compressionsupport/resources/compressdir/.manifest similarity index 100% rename from pkg/compressionsupport/resources/compressdir/.manifest rename to internal/compressionsupport/resources/compressdir/.manifest diff --git a/pkg/compressionsupport/resources/compressdir/compress.txt b/internal/compressionsupport/resources/compressdir/compress.txt similarity index 100% rename from pkg/compressionsupport/resources/compressdir/compress.txt rename to internal/compressionsupport/resources/compressdir/compress.txt diff --git a/pkg/decisionsupport/decision_support.go b/internal/decisionsupport/decision_support.go similarity index 100% rename from pkg/decisionsupport/decision_support.go rename to internal/decisionsupport/decision_support.go diff --git a/pkg/decisionsupport/decision_support_provider.go b/internal/decisionsupport/decision_support_provider.go similarity index 100% rename from pkg/decisionsupport/decision_support_provider.go rename to internal/decisionsupport/decision_support_provider.go diff --git a/pkg/decisionsupport/decision_support_test.go b/internal/decisionsupport/decision_support_test.go similarity index 96% rename from pkg/decisionsupport/decision_support_test.go rename to internal/decisionsupport/decision_support_test.go index 77364a98..7e737a74 100644 --- a/pkg/decisionsupport/decision_support_test.go +++ b/internal/decisionsupport/decision_support_test.go @@ -3,14 +3,14 @@ package decisionsupport_test import ( "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/decisionsupport" + "github.com/hexa-org/policy-orchestrator/internal/decisionsupportproviders" "io" "net" "net/http" "testing" "github.com/gorilla/mux" - "github.com/hexa-org/policy-orchestrator/pkg/decisionsupport" - "github.com/hexa-org/policy-orchestrator/pkg/decisionsupportproviders" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" diff --git a/pkg/decisionsupportproviders/default_provider.go b/internal/decisionsupportproviders/default_provider.go similarity index 100% rename from pkg/decisionsupportproviders/default_provider.go rename to internal/decisionsupportproviders/default_provider.go diff --git a/pkg/decisionsupportproviders/default_provider_test.go b/internal/decisionsupportproviders/default_provider_test.go similarity index 84% rename from pkg/decisionsupportproviders/default_provider_test.go rename to internal/decisionsupportproviders/default_provider_test.go index 571d62e7..e025974f 100644 --- a/pkg/decisionsupportproviders/default_provider_test.go +++ b/internal/decisionsupportproviders/default_provider_test.go @@ -1,9 +1,9 @@ package decisionsupportproviders_test import ( + "github.com/hexa-org/policy-orchestrator/internal/decisionsupportproviders" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/decisionsupportproviders" "github.com/stretchr/testify/assert" ) diff --git a/pkg/decisionsupportproviders/mock_provider.go b/internal/decisionsupportproviders/mock_provider.go similarity index 100% rename from pkg/decisionsupportproviders/mock_provider.go rename to internal/decisionsupportproviders/mock_provider.go diff --git a/pkg/decisionsupportproviders/mock_provider_test.go b/internal/decisionsupportproviders/mock_provider_test.go similarity index 94% rename from pkg/decisionsupportproviders/mock_provider_test.go rename to internal/decisionsupportproviders/mock_provider_test.go index 0edb3e92..024bb1ec 100644 --- a/pkg/decisionsupportproviders/mock_provider_test.go +++ b/internal/decisionsupportproviders/mock_provider_test.go @@ -1,10 +1,10 @@ package decisionsupportproviders_test import ( + "github.com/hexa-org/policy-orchestrator/internal/decisionsupportproviders" "net/http" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/decisionsupportproviders" "github.com/stretchr/testify/assert" ) diff --git a/pkg/decisionsupportproviders/opa_provider.go b/internal/decisionsupportproviders/opa_provider.go similarity index 100% rename from pkg/decisionsupportproviders/opa_provider.go rename to internal/decisionsupportproviders/opa_provider.go diff --git a/pkg/decisionsupportproviders/opa_provider_test.go b/internal/decisionsupportproviders/opa_provider_test.go similarity index 97% rename from pkg/decisionsupportproviders/opa_provider_test.go rename to internal/decisionsupportproviders/opa_provider_test.go index 345c179a..bf4d388b 100644 --- a/pkg/decisionsupportproviders/opa_provider_test.go +++ b/internal/decisionsupportproviders/opa_provider_test.go @@ -3,11 +3,11 @@ package decisionsupportproviders_test import ( "bytes" "errors" + "github.com/hexa-org/policy-orchestrator/internal/decisionsupportproviders" "io/ioutil" "net/http" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/decisionsupportproviders" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/orchestrator/applications_gateway.go b/internal/orchestrator/applications_gateway.go similarity index 100% rename from pkg/orchestrator/applications_gateway.go rename to internal/orchestrator/applications_gateway.go diff --git a/pkg/orchestrator/applications_gateway_test.go b/internal/orchestrator/applications_gateway_test.go similarity index 98% rename from pkg/orchestrator/applications_gateway_test.go rename to internal/orchestrator/applications_gateway_test.go index 4a9fdf84..95fdbd92 100644 --- a/pkg/orchestrator/applications_gateway_test.go +++ b/internal/orchestrator/applications_gateway_test.go @@ -1,10 +1,10 @@ package orchestrator_test import ( + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" "testing" "github.com/hexa-org/policy-orchestrator/pkg/databasesupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestrator/applications_handler.go b/internal/orchestrator/applications_handler.go similarity index 98% rename from pkg/orchestrator/applications_handler.go rename to internal/orchestrator/applications_handler.go index dcf4ed4d..9ea9af3b 100644 --- a/pkg/orchestrator/applications_handler.go +++ b/internal/orchestrator/applications_handler.go @@ -2,12 +2,12 @@ package orchestrator import ( "encoding/json" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "log" "net/http" "github.com/go-playground/validator/v10" "github.com/gorilla/mux" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" ) type Applications struct { diff --git a/pkg/orchestrator/applications_handler_test.go b/internal/orchestrator/applications_handler_test.go similarity index 98% rename from pkg/orchestrator/applications_handler_test.go rename to internal/orchestrator/applications_handler_test.go index e61ca9a0..c8f87b3c 100644 --- a/pkg/orchestrator/applications_handler_test.go +++ b/internal/orchestrator/applications_handler_test.go @@ -8,6 +8,8 @@ import ( "encoding/json" "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator/test" "net" "net/http" "testing" @@ -15,8 +17,6 @@ import ( "github.com/hexa-org/policy-orchestrator/pkg/databasesupport" "github.com/hexa-org/policy-orchestrator/pkg/hawksupport" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator/test" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" diff --git a/pkg/orchestrator/applications_service.go b/internal/orchestrator/applications_service.go similarity index 98% rename from pkg/orchestrator/applications_service.go rename to internal/orchestrator/applications_service.go index 6d1ff02c..129d1c1e 100644 --- a/pkg/orchestrator/applications_service.go +++ b/internal/orchestrator/applications_service.go @@ -2,10 +2,9 @@ package orchestrator import ( "errors" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "net/http" "strings" - - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" ) type ApplicationsService struct { diff --git a/pkg/orchestrator/applications_service_test.go b/internal/orchestrator/applications_service_test.go similarity index 97% rename from pkg/orchestrator/applications_service_test.go rename to internal/orchestrator/applications_service_test.go index da4c9334..d970f5b6 100644 --- a/pkg/orchestrator/applications_service_test.go +++ b/internal/orchestrator/applications_service_test.go @@ -3,13 +3,13 @@ package orchestrator_test import ( "database/sql" "errors" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator/test" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "log" "testing" "github.com/hexa-org/policy-orchestrator/pkg/databasesupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - orchestrator_test "github.com/hexa-org/policy-orchestrator/pkg/orchestrator/test" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" assert "github.com/stretchr/testify/require" ) diff --git a/pkg/orchestrator/discovery_worker.go b/internal/orchestrator/discovery_worker.go similarity index 100% rename from pkg/orchestrator/discovery_worker.go rename to internal/orchestrator/discovery_worker.go diff --git a/pkg/orchestrator/discovery_worker_test.go b/internal/orchestrator/discovery_worker_test.go similarity index 95% rename from pkg/orchestrator/discovery_worker_test.go rename to internal/orchestrator/discovery_worker_test.go index 08423e98..45cd65ab 100644 --- a/pkg/orchestrator/discovery_worker_test.go +++ b/internal/orchestrator/discovery_worker_test.go @@ -2,13 +2,13 @@ package orchestrator_test import ( "errors" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator/test" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "testing" "time" "github.com/hexa-org/policy-orchestrator/pkg/databasesupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator/test" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" "github.com/hexa-org/policy-orchestrator/pkg/workflowsupport" "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestrator/integrations_gateway.go b/internal/orchestrator/integrations_gateway.go similarity index 100% rename from pkg/orchestrator/integrations_gateway.go rename to internal/orchestrator/integrations_gateway.go diff --git a/pkg/orchestrator/integrations_gateway_test.go b/internal/orchestrator/integrations_gateway_test.go similarity index 97% rename from pkg/orchestrator/integrations_gateway_test.go rename to internal/orchestrator/integrations_gateway_test.go index fcea0398..ac56574c 100644 --- a/pkg/orchestrator/integrations_gateway_test.go +++ b/internal/orchestrator/integrations_gateway_test.go @@ -1,10 +1,10 @@ package orchestrator_test import ( + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" "testing" "github.com/hexa-org/policy-orchestrator/pkg/databasesupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestrator/integrations_handler.go b/internal/orchestrator/integrations_handler.go similarity index 100% rename from pkg/orchestrator/integrations_handler.go rename to internal/orchestrator/integrations_handler.go diff --git a/pkg/orchestrator/integrations_handler_test.go b/internal/orchestrator/integrations_handler_test.go similarity index 98% rename from pkg/orchestrator/integrations_handler_test.go rename to internal/orchestrator/integrations_handler_test.go index 6a27279a..7c3d6e1b 100644 --- a/pkg/orchestrator/integrations_handler_test.go +++ b/internal/orchestrator/integrations_handler_test.go @@ -7,6 +7,7 @@ import ( "encoding/hex" "encoding/json" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" "net" "net/http" "testing" @@ -14,7 +15,6 @@ import ( "github.com/hexa-org/policy-orchestrator/pkg/databasesupport" "github.com/hexa-org/policy-orchestrator/pkg/hawksupport" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/pkg/orchestrator/orchestration_handler.go b/internal/orchestrator/orchestration_handler.go similarity index 100% rename from pkg/orchestrator/orchestration_handler.go rename to internal/orchestrator/orchestration_handler.go diff --git a/pkg/orchestrator/orchestration_handler_test.go b/internal/orchestrator/orchestration_handler_test.go similarity index 94% rename from pkg/orchestrator/orchestration_handler_test.go rename to internal/orchestrator/orchestration_handler_test.go index 18877c31..2a3647fd 100644 --- a/pkg/orchestrator/orchestration_handler_test.go +++ b/internal/orchestrator/orchestration_handler_test.go @@ -7,7 +7,9 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/microsoftazure" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator/test" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/microsoftazure" "net" "net/http" "testing" @@ -15,8 +17,6 @@ import ( "github.com/hexa-org/policy-orchestrator/pkg/databasesupport" "github.com/hexa-org/policy-orchestrator/pkg/hawksupport" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator/test" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" diff --git a/pkg/orchestrator/orchestrator.go b/internal/orchestrator/orchestrator.go similarity index 100% rename from pkg/orchestrator/orchestrator.go rename to internal/orchestrator/orchestrator.go diff --git a/pkg/orchestrator/orchestrator_provider_interface.go b/internal/orchestrator/orchestrator_provider_interface.go similarity index 87% rename from pkg/orchestrator/orchestrator_provider_interface.go rename to internal/orchestrator/orchestrator_provider_interface.go index d919fe6f..0c1e20b9 100644 --- a/pkg/orchestrator/orchestrator_provider_interface.go +++ b/internal/orchestrator/orchestrator_provider_interface.go @@ -1,6 +1,8 @@ package orchestrator -import "github.com/hexa-org/policy-orchestrator/pkg/policysupport" +import ( + "github.com/hexa-org/policy-orchestrator/internal/policysupport" +) type Provider interface { Name() string diff --git a/pkg/orchestrator/orchestrator_test.go b/internal/orchestrator/orchestrator_test.go similarity index 90% rename from pkg/orchestrator/orchestrator_test.go rename to internal/orchestrator/orchestrator_test.go index 3991e0f7..8e0cedb5 100644 --- a/pkg/orchestrator/orchestrator_test.go +++ b/internal/orchestrator/orchestrator_test.go @@ -4,6 +4,8 @@ import ( "crypto/sha256" "encoding/hex" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator/test" "net" "net/http" "testing" @@ -11,8 +13,6 @@ import ( "github.com/hexa-org/policy-orchestrator/pkg/databasesupport" "github.com/hexa-org/policy-orchestrator/pkg/hawksupport" "github.com/hexa-org/policy-orchestrator/pkg/healthsupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator/test" "github.com/hexa-org/policy-orchestrator/pkg/websupport" "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestrator/test/noop_provider.go b/internal/orchestrator/test/noop_provider.go similarity index 91% rename from pkg/orchestrator/test/noop_provider.go rename to internal/orchestrator/test/noop_provider.go index b45ab901..4c71aff3 100644 --- a/pkg/orchestrator/test/noop_provider.go +++ b/internal/orchestrator/test/noop_provider.go @@ -1,10 +1,9 @@ package orchestrator_test import ( + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "net/http" - - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" ) type NoopProvider struct { diff --git a/pkg/orchestratorproviders/amazonwebservices/amazon_provider.go b/internal/orchestratorproviders/amazonwebservices/amazon_provider.go similarity index 98% rename from pkg/orchestratorproviders/amazonwebservices/amazon_provider.go rename to internal/orchestratorproviders/amazonwebservices/amazon_provider.go index 130953b1..ce4ce069 100644 --- a/pkg/orchestratorproviders/amazonwebservices/amazon_provider.go +++ b/internal/orchestratorproviders/amazonwebservices/amazon_provider.go @@ -5,6 +5,8 @@ import ( "context" "encoding/json" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "log" "net/http" "strings" @@ -14,8 +16,6 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" "github.com/go-playground/validator/v10" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" ) type CognitoClient interface { diff --git a/pkg/orchestratorproviders/amazonwebservices/amazon_provider_test.go b/internal/orchestratorproviders/amazonwebservices/amazon_provider_test.go similarity index 96% rename from pkg/orchestratorproviders/amazonwebservices/amazon_provider_test.go rename to internal/orchestratorproviders/amazonwebservices/amazon_provider_test.go index ab3308e5..da641896 100644 --- a/pkg/orchestratorproviders/amazonwebservices/amazon_provider_test.go +++ b/internal/orchestratorproviders/amazonwebservices/amazon_provider_test.go @@ -2,14 +2,14 @@ package amazonwebservices_test import ( "errors" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/amazonwebservices" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/amazonwebservices/test" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "net/http" "testing" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/amazonwebservices" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/amazonwebservices/test" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestratorproviders/amazonwebservices/test/doubles.go b/internal/orchestratorproviders/amazonwebservices/test/doubles.go similarity index 100% rename from pkg/orchestratorproviders/amazonwebservices/test/doubles.go rename to internal/orchestratorproviders/amazonwebservices/test/doubles.go diff --git a/pkg/orchestratorproviders/googlecloud/google_client.go b/internal/orchestratorproviders/googlecloud/google_client.go similarity index 97% rename from pkg/orchestratorproviders/googlecloud/google_client.go rename to internal/orchestratorproviders/googlecloud/google_client.go index 6625643f..b2da574b 100644 --- a/pkg/orchestratorproviders/googlecloud/google_client.go +++ b/internal/orchestratorproviders/googlecloud/google_client.go @@ -4,13 +4,12 @@ import ( "bytes" "encoding/json" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "io" "log" "net/http" "strings" - - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" ) type HTTPClient interface { diff --git a/pkg/orchestratorproviders/googlecloud/google_client_test.go b/internal/orchestratorproviders/googlecloud/google_client_test.go similarity index 97% rename from pkg/orchestratorproviders/googlecloud/google_client_test.go rename to internal/orchestratorproviders/googlecloud/google_client_test.go index 66ce061a..53910822 100644 --- a/pkg/orchestratorproviders/googlecloud/google_client_test.go +++ b/internal/orchestratorproviders/googlecloud/google_client_test.go @@ -2,10 +2,10 @@ package googlecloud_test import ( "errors" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/googlecloud" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/googlecloud" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestratorproviders/googlecloud/google_cloud_provider.go b/internal/orchestratorproviders/googlecloud/google_cloud_provider.go similarity index 96% rename from pkg/orchestratorproviders/googlecloud/google_cloud_provider.go rename to internal/orchestratorproviders/googlecloud/google_cloud_provider.go index 821ba0f7..702be235 100644 --- a/pkg/orchestratorproviders/googlecloud/google_cloud_provider.go +++ b/internal/orchestratorproviders/googlecloud/google_cloud_provider.go @@ -5,11 +5,11 @@ import ( "context" "encoding/json" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "strings" "github.com/go-playground/validator/v10" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" "google.golang.org/api/option" "google.golang.org/api/transport/http" ) diff --git a/pkg/orchestratorproviders/googlecloud/google_cloud_provider_test.go b/internal/orchestratorproviders/googlecloud/google_cloud_provider_test.go similarity index 95% rename from pkg/orchestratorproviders/googlecloud/google_cloud_provider_test.go rename to internal/orchestratorproviders/googlecloud/google_cloud_provider_test.go index 4aa0babd..0ce7e315 100644 --- a/pkg/orchestratorproviders/googlecloud/google_cloud_provider_test.go +++ b/internal/orchestratorproviders/googlecloud/google_cloud_provider_test.go @@ -1,11 +1,11 @@ package googlecloud_test import ( + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/googlecloud" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/googlecloud" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestratorproviders/googlecloud/responses_test.go b/internal/orchestratorproviders/googlecloud/responses_test.go similarity index 100% rename from pkg/orchestratorproviders/googlecloud/responses_test.go rename to internal/orchestratorproviders/googlecloud/responses_test.go diff --git a/pkg/orchestratorproviders/microsoftazure/azure_client.go b/internal/orchestratorproviders/microsoftazure/azure_client.go similarity index 99% rename from pkg/orchestratorproviders/microsoftazure/azure_client.go rename to internal/orchestratorproviders/microsoftazure/azure_client.go index 8ee3fa26..a606f1ec 100644 --- a/pkg/orchestratorproviders/microsoftazure/azure_client.go +++ b/internal/orchestratorproviders/microsoftazure/azure_client.go @@ -4,13 +4,12 @@ import ( "bytes" "encoding/json" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" "io" "log" "net/http" "net/url" "strings" - - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" ) type HTTPClient interface { diff --git a/pkg/orchestratorproviders/microsoftazure/azure_client_test.go b/internal/orchestratorproviders/microsoftazure/azure_client_test.go similarity index 99% rename from pkg/orchestratorproviders/microsoftazure/azure_client_test.go rename to internal/orchestratorproviders/microsoftazure/azure_client_test.go index cf03c9c8..53b0caa9 100644 --- a/pkg/orchestratorproviders/microsoftazure/azure_client_test.go +++ b/internal/orchestratorproviders/microsoftazure/azure_client_test.go @@ -2,10 +2,10 @@ package microsoftazure_test import ( "errors" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/microsoftazure" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" "testing" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/microsoftazure" "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestratorproviders/microsoftazure/azure_provider.go b/internal/orchestratorproviders/microsoftazure/azure_provider.go similarity index 96% rename from pkg/orchestratorproviders/microsoftazure/azure_provider.go rename to internal/orchestratorproviders/microsoftazure/azure_provider.go index 049cfa1a..a1579eca 100644 --- a/pkg/orchestratorproviders/microsoftazure/azure_provider.go +++ b/internal/orchestratorproviders/microsoftazure/azure_provider.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" "github.com/go-playground/validator/v10" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "github.com/hexa-org/policy-orchestrator/pkg/workflowsupport" "net/http" "strings" diff --git a/pkg/orchestratorproviders/microsoftazure/azure_provider_test.go b/internal/orchestratorproviders/microsoftazure/azure_provider_test.go similarity index 96% rename from pkg/orchestratorproviders/microsoftazure/azure_provider_test.go rename to internal/orchestratorproviders/microsoftazure/azure_provider_test.go index 8112e4ba..a1f175c9 100644 --- a/pkg/orchestratorproviders/microsoftazure/azure_provider_test.go +++ b/internal/orchestratorproviders/microsoftazure/azure_provider_test.go @@ -1,9 +1,9 @@ package microsoftazure_test import ( - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/microsoftazure" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/microsoftazure" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" "github.com/stretchr/testify/assert" "net/http" diff --git a/pkg/orchestratorproviders/openpolicyagent/gcp_bundle_client.go b/internal/orchestratorproviders/openpolicyagent/gcp_bundle_client.go similarity index 98% rename from pkg/orchestratorproviders/openpolicyagent/gcp_bundle_client.go rename to internal/orchestratorproviders/openpolicyagent/gcp_bundle_client.go index 2bf85be7..9a80e4e1 100644 --- a/pkg/orchestratorproviders/openpolicyagent/gcp_bundle_client.go +++ b/internal/orchestratorproviders/openpolicyagent/gcp_bundle_client.go @@ -6,13 +6,13 @@ import ( "encoding/json" "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/compressionsupport" "log" "net/http" "net/url" "os" "path/filepath" - "github.com/hexa-org/policy-orchestrator/pkg/compressionsupport" "google.golang.org/api/option" ghttp "google.golang.org/api/transport/http" ) diff --git a/pkg/orchestratorproviders/openpolicyagent/gcp_bundle_client_test.go b/internal/orchestratorproviders/openpolicyagent/gcp_bundle_client_test.go similarity index 97% rename from pkg/orchestratorproviders/openpolicyagent/gcp_bundle_client_test.go rename to internal/orchestratorproviders/openpolicyagent/gcp_bundle_client_test.go index f8661db6..894d2a79 100644 --- a/pkg/orchestratorproviders/openpolicyagent/gcp_bundle_client_test.go +++ b/internal/orchestratorproviders/openpolicyagent/gcp_bundle_client_test.go @@ -4,6 +4,8 @@ import ( "bytes" "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/compressionsupport" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/openpolicyagent" "math/rand" "net/http" "net/url" @@ -12,8 +14,6 @@ import ( "testing" "time" - "github.com/hexa-org/policy-orchestrator/pkg/compressionsupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/openpolicyagent" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" assert "github.com/stretchr/testify/require" ) diff --git a/pkg/orchestratorproviders/openpolicyagent/http_bundle_client.go b/internal/orchestratorproviders/openpolicyagent/http_bundle_client.go similarity index 95% rename from pkg/orchestratorproviders/openpolicyagent/http_bundle_client.go rename to internal/orchestratorproviders/openpolicyagent/http_bundle_client.go index 01596976..3c3a147c 100644 --- a/pkg/orchestratorproviders/openpolicyagent/http_bundle_client.go +++ b/internal/orchestratorproviders/openpolicyagent/http_bundle_client.go @@ -3,14 +3,13 @@ package openpolicyagent import ( "bytes" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/compressionsupport" "io" "mime/multipart" "net/http" "net/url" "os" "path/filepath" - - "github.com/hexa-org/policy-orchestrator/pkg/compressionsupport" ) type HTTPClient interface { diff --git a/pkg/orchestratorproviders/openpolicyagent/http_bundle_client_test.go b/internal/orchestratorproviders/openpolicyagent/http_bundle_client_test.go similarity index 95% rename from pkg/orchestratorproviders/openpolicyagent/http_bundle_client_test.go rename to internal/orchestratorproviders/openpolicyagent/http_bundle_client_test.go index f05d8665..e812fd55 100644 --- a/pkg/orchestratorproviders/openpolicyagent/http_bundle_client_test.go +++ b/internal/orchestratorproviders/openpolicyagent/http_bundle_client_test.go @@ -4,6 +4,8 @@ import ( "bytes" "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/compressionsupport" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/openpolicyagent" "math/rand" "os" "path/filepath" @@ -11,8 +13,6 @@ import ( "testing" "time" - "github.com/hexa-org/policy-orchestrator/pkg/compressionsupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/openpolicyagent" "github.com/hexa-org/policy-orchestrator/pkg/testsupport" "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestratorproviders/openpolicyagent/opa_policy_test.go b/internal/orchestratorproviders/openpolicyagent/opa_policy_test.go similarity index 97% rename from pkg/orchestratorproviders/openpolicyagent/opa_policy_test.go rename to internal/orchestratorproviders/openpolicyagent/opa_policy_test.go index 6f10426a..780f6031 100644 --- a/pkg/orchestratorproviders/openpolicyagent/opa_policy_test.go +++ b/internal/orchestratorproviders/openpolicyagent/opa_policy_test.go @@ -2,6 +2,7 @@ package openpolicyagent_test import ( "bytes" + "github.com/hexa-org/policy-orchestrator/internal/decisionsupportproviders" "log" "net/http" "os" @@ -12,7 +13,6 @@ import ( "testing" "time" - "github.com/hexa-org/policy-orchestrator/pkg/decisionsupportproviders" assert "github.com/stretchr/testify/require" ) diff --git a/pkg/orchestratorproviders/openpolicyagent/opa_provider.go b/internal/orchestratorproviders/openpolicyagent/opa_provider.go similarity index 97% rename from pkg/orchestratorproviders/openpolicyagent/opa_provider.go rename to internal/orchestratorproviders/openpolicyagent/opa_provider.go index 849ddb62..1cbbb2b9 100644 --- a/pkg/orchestratorproviders/openpolicyagent/opa_provider.go +++ b/internal/orchestratorproviders/openpolicyagent/opa_provider.go @@ -7,6 +7,9 @@ import ( "encoding/base64" "encoding/json" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/compressionsupport" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "io/ioutil" "log" "math/rand" @@ -18,9 +21,6 @@ import ( "time" "github.com/go-playground/validator/v10" - "github.com/hexa-org/policy-orchestrator/pkg/compressionsupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" ) type BundleClient interface { diff --git a/pkg/orchestratorproviders/openpolicyagent/opa_provider_test.go b/internal/orchestratorproviders/openpolicyagent/opa_provider_test.go similarity index 96% rename from pkg/orchestratorproviders/openpolicyagent/opa_provider_test.go rename to internal/orchestratorproviders/openpolicyagent/opa_provider_test.go index 79b06696..4cca2c91 100644 --- a/pkg/orchestratorproviders/openpolicyagent/opa_provider_test.go +++ b/internal/orchestratorproviders/openpolicyagent/opa_provider_test.go @@ -6,6 +6,11 @@ import ( "encoding/pem" "errors" "fmt" + "github.com/hexa-org/policy-orchestrator/internal/compressionsupport" + "github.com/hexa-org/policy-orchestrator/internal/orchestrator" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/openpolicyagent" + "github.com/hexa-org/policy-orchestrator/internal/orchestratorproviders/openpolicyagent/test" + "github.com/hexa-org/policy-orchestrator/internal/policysupport" "io/ioutil" "math/rand" "net/http" @@ -16,11 +21,6 @@ import ( "testing" "time" - "github.com/hexa-org/policy-orchestrator/pkg/compressionsupport" - "github.com/hexa-org/policy-orchestrator/pkg/orchestrator" - "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/openpolicyagent" - openpolicyagent_test "github.com/hexa-org/policy-orchestrator/pkg/orchestratorproviders/openpolicyagent/test" - "github.com/hexa-org/policy-orchestrator/pkg/policysupport" "github.com/stretchr/testify/assert" ) diff --git a/pkg/orchestratorproviders/openpolicyagent/resources/bundles/bundle/.manifest b/internal/orchestratorproviders/openpolicyagent/resources/bundles/bundle/.manifest similarity index 100% rename from pkg/orchestratorproviders/openpolicyagent/resources/bundles/bundle/.manifest rename to internal/orchestratorproviders/openpolicyagent/resources/bundles/bundle/.manifest diff --git a/pkg/orchestratorproviders/openpolicyagent/resources/bundles/bundle/data.json b/internal/orchestratorproviders/openpolicyagent/resources/bundles/bundle/data.json similarity index 100% rename from pkg/orchestratorproviders/openpolicyagent/resources/bundles/bundle/data.json rename to internal/orchestratorproviders/openpolicyagent/resources/bundles/bundle/data.json diff --git a/pkg/orchestratorproviders/openpolicyagent/resources/bundles/bundle/policy.rego b/internal/orchestratorproviders/openpolicyagent/resources/bundles/bundle/policy.rego similarity index 100% rename from pkg/orchestratorproviders/openpolicyagent/resources/bundles/bundle/policy.rego rename to internal/orchestratorproviders/openpolicyagent/resources/bundles/bundle/policy.rego diff --git a/pkg/orchestratorproviders/openpolicyagent/test/mock_client.go b/internal/orchestratorproviders/openpolicyagent/test/mock_client.go similarity index 100% rename from pkg/orchestratorproviders/openpolicyagent/test/mock_client.go rename to internal/orchestratorproviders/openpolicyagent/test/mock_client.go diff --git a/pkg/policysupport/policy_support.go b/internal/policysupport/policy_support.go similarity index 100% rename from pkg/policysupport/policy_support.go rename to internal/policysupport/policy_support.go diff --git a/pkg/testsupport/test_support.go b/pkg/testsupport/test_support.go index 6e69084f..6fa16f3a 100644 --- a/pkg/testsupport/test_support.go +++ b/pkg/testsupport/test_support.go @@ -1,5 +1,14 @@ package testsupport +import ( + "fmt" + "io" + "net/http" + "testing" + + "github.com/stretchr/testify/assert" +) + type TestData interface { SetUp() TearDown() @@ -11,6 +20,22 @@ func WithSetUp[T TestData](data T, test func(data T)) { data.TearDown() } +func AssertGetContains(t *testing.T, app *http.Server, uri string, expected string) { + version, _ := http.Get(fmt.Sprintf("http://%s%s", app.Addr, uri)) + assert.Equal(t, http.StatusOK, version.StatusCode) + versionBody, _ := io.ReadAll(version.Body) + assert.Contains(t, string(versionBody), expected) +} + +func AssertGetWithCookieContains(t *testing.T, app *http.Server, client *http.Client, cookie *http.Cookie, uri string, expected string) { + request, _ := http.NewRequest("GET", fmt.Sprintf("http://%s%s", app.Addr, uri), nil) + request.AddCookie(cookie) + response, _ := client.Do(request) + assert.Equal(t, http.StatusOK, response.StatusCode) + body, _ := io.ReadAll(response.Body) + assert.Contains(t, string(body), expected) +} + func AssertExists(file []byte, err error) []byte { if err != nil { panic("unable to read file.")