moved some files over to an internal folder

suecodelabs · Nov 27, 2022 · 10240b3 · 10240b3
1 parent cb45f67
commit 10240b3
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 23 deletions.
diff --git a/src/cmd/cnfuzz/main.go b/src/cmd/cnfuzz/main.go
@@ -18,8 +18,8 @@ package main
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/persistence"
+	"github.com/suecodelabs/cnfuzz/src/internal/controller"
+	"github.com/suecodelabs/cnfuzz/src/internal/persistence"
 	"github.com/suecodelabs/cnfuzz/src/pkg/config"
 	"github.com/suecodelabs/cnfuzz/src/pkg/health"
 	"github.com/suecodelabs/cnfuzz/src/pkg/k8s"
@@ -103,7 +103,7 @@ func run(l logger.Logger, args Args) {
 	go health.Serv(hc)
 	client := k8s.CreateClientset(l, !args.localConfig)
 	// Start fuzzing!
-	err = cnfuzz.StartController(l, strg, cnf, overwrites, client)
+	err = controller.StartController(l, strg, cnf, overwrites, client)
 	if err != nil {
 		l.FatalError(err, "error while starting cnfuzz controller")
 	}

diff --git a/src/cmd/restlerwrapper/main.go b/src/cmd/restlerwrapper/main.go
@@ -18,10 +18,10 @@ package main
 
 import (
 	"github.com/spf13/cobra"
+	"github.com/suecodelabs/cnfuzz/src/internal/api_info"
+	"github.com/suecodelabs/cnfuzz/src/internal/restler"
 	"github.com/suecodelabs/cnfuzz/src/pkg/discovery/openapi"
 	"github.com/suecodelabs/cnfuzz/src/pkg/logger"
-	"github.com/suecodelabs/cnfuzz/src/pkg/restlerwrapper"
-	"github.com/suecodelabs/cnfuzz/src/pkg/restlerwrapper/restler"
 	"log"
 	"os"
 )
@@ -87,7 +87,7 @@ func run(l logger.Logger, args Args) {
 		ports = append(ports, args.targetPort)
 	}
 	l.V(logger.DebugLevel).Info("fetching info from target ...")
-	info := restlerwrapper.CollectInfo(l, args.targetPod, args.targetNamespace, args.dDocIp, args.dDocLoc, ports, args.localConfig)
+	info := api_info.CollectInfo(l, args.targetPod, args.targetNamespace, args.dDocIp, args.dDocLoc, ports, args.localConfig)
 	if !args.dryRun {
 		l.V(logger.DebugLevel).Info("writing OpenApi document to a file so Restler can pick it up later")
 		writeDocToFile(l, info.UnparsedApiDoc)

diff --git a/src/pkg/restlerwrapper/collect_info.go → src/internal/api_info/collect_info.go b/src/pkg/restlerwrapper/collect_info.go → src/internal/api_info/collect_info.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package restlerwrapper
+package api_info
 
 import (
 	"context"

diff --git a/src/pkg/restlerwrapper/collect_info_test.go → src/internal/api_info/collect_info_test.go b/src/pkg/restlerwrapper/collect_info_test.go → src/internal/api_info/collect_info_test.go
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-package restlerwrapper
+package api_info
diff --git a/src/pkg/cnfuzz/controller.go → src/internal/controller/controller.go b/src/pkg/cnfuzz/controller.go → src/internal/controller/controller.go
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package cnfuzz
+package controller
 
 import (
 	"context"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/model"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/persistence"
+	"github.com/suecodelabs/cnfuzz/src/internal/model"
+	"github.com/suecodelabs/cnfuzz/src/internal/persistence"
 	"github.com/suecodelabs/cnfuzz/src/pkg/config"
 	"github.com/suecodelabs/cnfuzz/src/pkg/k8s"
 	"github.com/suecodelabs/cnfuzz/src/pkg/k8s/util"

diff --git a/src/pkg/cnfuzz/controller_test.go → src/internal/controller/controller_test.go b/src/pkg/cnfuzz/controller_test.go → src/internal/controller/controller_test.go
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package cnfuzz
+package controller
 
 import (
 	"context"
 	"fmt"
 	"github.com/stretchr/testify/assert"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/model"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/persistence"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/persistence/in_memory"
+	"github.com/suecodelabs/cnfuzz/src/internal/model"
+	"github.com/suecodelabs/cnfuzz/src/internal/persistence"
+	"github.com/suecodelabs/cnfuzz/src/internal/persistence/in_memory"
 	config "github.com/suecodelabs/cnfuzz/src/pkg/config"
 	"github.com/suecodelabs/cnfuzz/src/pkg/logger"
 	apiv1 "k8s.io/api/core/v1"

diff --git a/src/pkg/cnfuzz/model/container_image.go → src/internal/model/container_image.go b/src/pkg/cnfuzz/model/container_image.go → src/internal/model/container_image.go
diff --git a/src/pkg/cnfuzz/model/container_image_test.go → src/internal/model/container_image_test.go b/src/pkg/cnfuzz/model/container_image_test.go → src/internal/model/container_image_test.go
diff --git a/src/pkg/cnfuzz/persistence/cache.go → src/internal/persistence/cache.go b/src/pkg/cnfuzz/persistence/cache.go → src/internal/persistence/cache.go
@@ -19,9 +19,9 @@ package persistence
 import (
 	"context"
 	"fmt"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/model"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/persistence/in_memory"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/persistence/redis"
+	"github.com/suecodelabs/cnfuzz/src/internal/model"
+	"github.com/suecodelabs/cnfuzz/src/internal/persistence/in_memory"
+	"github.com/suecodelabs/cnfuzz/src/internal/persistence/redis"
 	"github.com/suecodelabs/cnfuzz/src/pkg/health"
 	"github.com/suecodelabs/cnfuzz/src/pkg/logger"
 )

diff --git a/.../persistence/in_memory/container_image.go → .../persistence/in_memory/container_image.go b/.../persistence/in_memory/container_image.go → .../persistence/in_memory/container_image.go
@@ -19,7 +19,7 @@ package in_memory
 import (
 	"context"
 	"errors"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/model"
+	"github.com/suecodelabs/cnfuzz/src/internal/model"
 	"github.com/suecodelabs/cnfuzz/src/pkg/logger"
 )
 

diff --git a/...istence/in_memory/container_image_test.go → ...istence/in_memory/container_image_test.go b/...istence/in_memory/container_image_test.go → ...istence/in_memory/container_image_test.go
@@ -19,7 +19,7 @@ package in_memory
 import (
 	"context"
 	"github.com/stretchr/testify/assert"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/model"
+	"github.com/suecodelabs/cnfuzz/src/internal/model"
 	"testing"
 )
 

diff --git a/...fuzz/persistence/redis/container_image.go → ...rnal/persistence/redis/container_image.go b/...fuzz/persistence/redis/container_image.go → ...rnal/persistence/redis/container_image.go
@@ -18,7 +18,7 @@ package redis
 
 import (
 	"context"
-	"github.com/suecodelabs/cnfuzz/src/pkg/cnfuzz/model"
+	"github.com/suecodelabs/cnfuzz/src/internal/model"
 	"github.com/suecodelabs/cnfuzz/src/pkg/health"
 	"github.com/suecodelabs/cnfuzz/src/pkg/logger"
 	"time"

diff --git a/...persistence/redis/container_image_test.go → ...persistence/redis/container_image_test.go b/...persistence/redis/container_image_test.go → ...persistence/redis/container_image_test.go
diff --git a/src/pkg/cnfuzz/persistence/storage_type.go → src/internal/persistence/storage_type.go b/src/pkg/cnfuzz/persistence/storage_type.go → src/internal/persistence/storage_type.go
diff --git a/...restlerwrapper/restler/command_builder.go → src/internal/restler/command_builder.go b/...restlerwrapper/restler/command_builder.go → src/internal/restler/command_builder.go
diff --git a/src/pkg/restlerwrapper/restler/execute.go → src/internal/restler/execute.go b/src/pkg/restlerwrapper/restler/execute.go → src/internal/restler/execute.go
@@ -18,13 +18,13 @@ package restler
 
 import (
 	"fmt"
+	"github.com/suecodelabs/cnfuzz/src/internal/api_info"
 	"github.com/suecodelabs/cnfuzz/src/pkg/logger"
-	"github.com/suecodelabs/cnfuzz/src/pkg/restlerwrapper"
 	"os/exec"
 	"strings"
 )
 
-func ExecuteRestlerCmds(l logger.Logger, dryRun bool, info restlerwrapper.TargetInfo) {
+func ExecuteRestlerCmds(l logger.Logger, dryRun bool, info api_info.TargetInfo) {
 	compileCmd, compileArgs := CreateRestlerCompileCommand(l)
 	if !dryRun {
 		out, err := exec.Command(compileCmd, compileArgs...).Output()