Revert "Preparation for Otterize Cloud release (#61)"

This reverts commit c36e14b.
otterize · Jan 15, 2023 · 475004b · 475004b
1 parent c36e14b
commit 475004b
Show file tree

Hide file tree

Showing 37 changed files with 200 additions and 1,273 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,7 +10,6 @@ on:
   push:
     branches:
       - main
-      - develop
 
 env:
   REGISTRY: 353146681200.dkr.ecr.us-east-1.amazonaws.com/otterize
@@ -32,7 +31,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: recursive
-          token: ${{ secrets.OTTERIZEBOT_GITHUB_TOKEN }} # required for checking out submodules
 
       - name: Set up Docker Buildx
         id: buildx

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
diff --git a/.gitmodules b/.gitmodules
diff --git a/src/cloudgraphql b/src/cloudgraphql
diff --git a/src/go.mod b/src/go.mod
diff --git a/src/mappergraphql/schema.graphql → src/graphql/schema.graphql b/src/mappergraphql/schema.graphql → src/graphql/schema.graphql
@@ -1,13 +1,8 @@
-scalar Time # Equivalent of Go's time.Time provided by gqlgen
+
 
 input CaptureResultForSrcIp {
     srcIp: String!
-    destinations: [Destination!]!
-}
-
-input Destination {
-    destination: String!
-    lastSeen: Time!
+    destinations: [String!]!
 }
 
 input CaptureResults {
@@ -16,7 +11,7 @@ input CaptureResults {
 
 input SocketScanResultForSrcIp {
     srcIp: String!
-    destIps: [Destination!]!
+    destIps: [String!]!
 }
 
 input SocketScanResults {

diff --git a/src/mapper.Dockerfile b/src/mapper.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 golang:1.19-alpine as buildenv
+FROM --platform=linux/amd64 golang:1.18-alpine as buildenv
 RUN apk add --no-cache ca-certificates git protoc
 RUN apk add build-base libpcap-dev
 WORKDIR /src

diff --git a/src/mapper/cmd/main.go b/src/mapper/cmd/main.go
@@ -5,8 +5,6 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/otterize/intents-operator/src/shared/serviceidresolver"
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
-	"github.com/otterize/network-mapper/src/mapper/pkg/clouduploader"
 	"github.com/otterize/network-mapper/src/mapper/pkg/config"
 	"github.com/otterize/network-mapper/src/mapper/pkg/kubefinder"
 	"github.com/otterize/network-mapper/src/mapper/pkg/resolvers"
@@ -15,11 +13,9 @@ import (
 	"github.com/spf13/viper"
 	"net/http"
 	"os"
-	"os/signal"
 	clientconfig "sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
-	"syscall"
 	"time"
 )
 
@@ -83,22 +79,11 @@ func main() {
 		logrus.Error(intentHolderCfg)
 		os.Exit(1)
 	}
-
-	cloudConfig := clouduploader.ConfigFromViper()
 	intentsHolder := resolvers.NewIntentsHolder(mgr.GetClient(), intentHolderCfg)
-	cloudClient := clouduploader.NewCloudUploader(intentsHolder, cloudConfig, cloudclient.NewClient)
 	resolver := resolvers.NewResolver(kubeFinder, serviceidresolver.NewResolver(mgr.GetClient()), intentsHolder)
 	_ = resolver.LoadStore(initCtx) // loads the store from the previous run
 	resolver.Register(e)
 
-	if cloudConfig.IsCloudUploadEnabled() {
-		go func() {
-			cloudClientCtx, cloudClientCancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
-			defer cloudClientCancel()
-			cloudClient.PeriodicIntentsUpload(cloudClientCtx)
-		}()
-	}
-
 	logrus.Info("Starting api server")
 	err = e.Start("0.0.0.0:9090")
 	if err != nil {

diff --git a/src/mapper/gqlgen.yml b/src/mapper/gqlgen.yml
@@ -1,6 +1,6 @@
 # Where are all the schema files located? globs are supported eg  src/**/*.graphqls
 schema:
-  - '../mappergraphql/*.graphql'
+  - '../graphql/*'
 
 # Where should the generated server code go?
 exec:

diff --git a/src/mapper/pkg/cloudclient/cloud_client.go b/src/mapper/pkg/cloudclient/cloud_client.go
diff --git a/src/mapper/pkg/cloudclient/generate.go b/src/mapper/pkg/cloudclient/generate.go