Skip to content

Commit

Permalink
Move project specific packages to internal and add some more testing …
Browse files Browse the repository at this point in the history
…functions

Signed-off-by: Dylan Ham <[email protected]>
  • Loading branch information
MrOrangeAndHam authored and Dylan Ham committed Dec 8, 2022
1 parent dfa80cf commit c80e9e7
Show file tree
Hide file tree
Showing 96 changed files with 113 additions and 91 deletions.
2 changes: 1 addition & 1 deletion cmd/admin/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/demo/demo.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/democonfig/democonfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"crypto/tls"
"fmt"
"github.com/hexa-org/policy-orchestrator/internal/compressionsupport"
"io/fs"
"log"
"math/rand"
Expand All @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/democonfig/democonfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
"github.com/hexa-org/policy-orchestrator/internal/compressionsupport"
"mime/multipart"
"net"
"net/http"
Expand All @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions cmd/orchestrator/orchestrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/admin/admin_test.go → internal/admin/admin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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"
"net/http"
"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"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/admin/status_test.go → internal/admin/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ 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"

"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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"github.com/hexa-org/policy-orchestrator/internal/orchestrator"
"net"
"net/http"
"testing"

"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"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ 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"

"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"
Expand Down
File renamed without changes.
Loading

0 comments on commit c80e9e7

Please sign in to comment.