From 204aad60c47a35f5fb5a70762d8f80177447203b Mon Sep 17 00:00:00 2001
From: RamiBerm <rami.berman@up9.com>
Date: Mon, 10 May 2021 11:39:43 +0300
Subject: [PATCH] Update go.mod, main.go, and 9 more files...

---
 api/go.mod                                 | 6 +++---
 api/pkg/inserter/main.go                   | 2 +-
 {resolver => api/pkg/resolver}/README.md   | 4 +++-
 {resolver => api/pkg/resolver}/go.sum      | 0
 {resolver => api/pkg/resolver}/loader.go   | 0
 {resolver => api/pkg/resolver}/resolver.go | 0
 resolver/go.mod                            | 9 ---------
 7 files changed, 7 insertions(+), 14 deletions(-)
 rename {resolver => api/pkg/resolver}/README.md (98%)
 rename {resolver => api/pkg/resolver}/go.sum (100%)
 rename {resolver => api/pkg/resolver}/loader.go (100%)
 rename {resolver => api/pkg/resolver}/resolver.go (100%)
 delete mode 100644 resolver/go.mod

diff --git a/api/go.mod b/api/go.mod
index 79abe41c1..42e3eca49 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -3,7 +3,6 @@ module mizuserver
 go 1.16
 
 require (
-	github.com/up9inc/mizu/resolver v0.0.0
 	github.com/antoniodipinto/ikisocket v0.0.0-20210417133349-f1502512d69a
 	github.com/djherbis/atime v1.0.0
 	github.com/fasthttp/websocket v1.4.3-beta.1 // indirect
@@ -22,6 +21,7 @@ require (
 	golang.org/x/net v0.0.0-20210421230115-4e50805a0758
 	gorm.io/driver/sqlite v1.1.4
 	gorm.io/gorm v1.21.8
+	k8s.io/api v0.21.0 // indirect
+	k8s.io/apimachinery v0.21.0
+	k8s.io/client-go v0.21.0
 )
-
-replace github.com/up9inc/mizu/resolver => ../resolver
diff --git a/api/pkg/inserter/main.go b/api/pkg/inserter/main.go
index 9dc5dc53a..63985b5c7 100644
--- a/api/pkg/inserter/main.go
+++ b/api/pkg/inserter/main.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"github.com/antoniodipinto/ikisocket"
 	"github.com/google/martian/har"
-	"github.com/up9inc/mizu/resolver"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"mizuserver/pkg/database"
 	"mizuserver/pkg/models"
+	"mizuserver/pkg/resolver"
 	"mizuserver/pkg/utils"
 	"net/url"
 	"os"
diff --git a/resolver/README.md b/api/pkg/resolver/README.md
similarity index 98%
rename from resolver/README.md
rename to api/pkg/resolver/README.md
index 81f9f5914..0ce3b933c 100644
--- a/resolver/README.md
+++ b/api/pkg/resolver/README.md
@@ -1,3 +1,5 @@
+<!--
+(NOT RELEVANT CURRENTLY)
 ## Installation
 To be able to import this package, you must add `replace github.com/up9inc/mizu/resolver => ../resolver` to the end of your `go.mod` file 
 
@@ -22,7 +24,7 @@ replace github.com/up9inc/mizu/resolver => ../resolver
 ```
 
 Now you will be able to import `github.com/up9inc/mizu/resolver` in any `.go` file
-
+-->
 ## Usage
 
 ### Full example
diff --git a/resolver/go.sum b/api/pkg/resolver/go.sum
similarity index 100%
rename from resolver/go.sum
rename to api/pkg/resolver/go.sum
diff --git a/resolver/loader.go b/api/pkg/resolver/loader.go
similarity index 100%
rename from resolver/loader.go
rename to api/pkg/resolver/loader.go
diff --git a/resolver/resolver.go b/api/pkg/resolver/resolver.go
similarity index 100%
rename from resolver/resolver.go
rename to api/pkg/resolver/resolver.go
diff --git a/resolver/go.mod b/resolver/go.mod
deleted file mode 100644
index ed3492ecd..000000000
--- a/resolver/go.mod
+++ /dev/null
@@ -1,9 +0,0 @@
-module github.com/up9inc/mizu/resolver
-
-go 1.16
-
-require (
-	k8s.io/api v0.21.0 // indirect
-	k8s.io/apimachinery v0.21.0
-	k8s.io/client-go v0.21.0
-)