updated all dev things

Kannan112 · Dec 28, 2023 · f4ff991 · f4ff991
1 parent 2561660
commit f4ff991
Show file tree

Hide file tree

Showing 12 changed files with 234 additions and 43 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,5 +8,5 @@ RUN go build -v -o /home/build/api ./cmd/api
 
 FROM gcr.io/distroless/static-debian11
 COPY --from=build-stage /home/build/api /api 
-COPY --from=build-stage /home/app/razor.html /razor.html
+COPY --from=build-stage /home/app/view/razor.html /razor.html
 CMD ["/api"]
diff --git a/backend-kubernetes.yml b/backend-kubernetes.yml
diff --git a/cmd/api/docs/docs.go b/cmd/api/docs/docs.go
@@ -1003,6 +1003,26 @@ const docTemplate = `{
                 }
             }
         },
+        "/api/auth/google-login": {
+            "get": {
+                "description": "Initiates the Google login flow",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Authentication"
+                ],
+                "summary": "Google Login",
+                "responses": {
+                    "303": {
+                        "description": "See Other",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
         "/api/renew-token": {
             "post": {
                 "description": "Get access token using TokenString",

diff --git a/cmd/api/docs/swagger.json b/cmd/api/docs/swagger.json
@@ -995,6 +995,26 @@
                 }
             }
         },
+        "/api/auth/google-login": {
+            "get": {
+                "description": "Initiates the Google login flow",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Authentication"
+                ],
+                "summary": "Google Login",
+                "responses": {
+                    "303": {
+                        "description": "See Other",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
         "/api/renew-token": {
             "post": {
                 "description": "Get access token using TokenString",

diff --git a/cmd/api/docs/swagger.yaml b/cmd/api/docs/swagger.yaml
@@ -805,6 +805,19 @@ paths:
       summary: Admin can unbolock a blocked user
       tags:
       - Admin
+  /api/auth/google-login:
+    get:
+      description: Initiates the Google login flow
+      produces:
+      - application/json
+      responses:
+        "303":
+          description: See Other
+          schema:
+            type: string
+      summary: Google Login
+      tags:
+      - Authentication
   /api/renew-token:
     post:
       consumes:

diff --git a/cmd/api/tmp/api.exe b/cmd/api/tmp/api.exe
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,17 +7,19 @@ services:
       - POSTGRES_USER=bucketeer
       - POSTGRES_PASSWORD=bucketeer_pass
       - POSTGRES_DB=bucketeer_db
-
     ports:
-      - "5431:5432"
+      - "5432:5432"
     volumes:
       - data:/var/lib/postgresql/data
+    networks:
+      - mynetwork
+
   server:
     build:
       context: .
       dockerfile: Dockerfile
     ports:
-      - 8080:3000
+      - 8080:8080
     environment:
       - DB_HOST=database  
       - DB_USER=bucketeer
@@ -27,6 +29,11 @@ services:
     depends_on:
       - database
     networks:
-      - default
+      - mynetwork
+
+networks:
+  mynetwork:
+    driver: bridge
+
 volumes:
-  data:
+  data:
diff --git a/go.mod b/go.mod
@@ -1,24 +1,28 @@
 module github.com/kannan112/go-gin-clean-arch
 
-go 1.19
+go 1.21
+
+toolchain go1.21.5
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/gin-gonic/gin v1.9.0
+	github.com/gin-gonic/gin v1.9.1
 	github.com/go-playground/assert/v2 v2.2.0
-	github.com/go-playground/validator/v10 v10.13.0
+	github.com/go-playground/validator/v10 v10.16.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/golang/mock v1.6.0
 	github.com/google/wire v0.5.0
+	github.com/markbates/goth v1.78.0
 	github.com/razorpay/razorpay-go v0.0.0-20230410044935-943abe07d4c1
 	github.com/spf13/viper v1.15.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.0
-	github.com/swaggo/swag v1.16.1
+	github.com/swaggo/swag v1.16.2
 	github.com/twilio/twilio-go v1.6.0
-	golang.org/x/crypto v0.9.0
-	golang.org/x/net v0.10.0
+	golang.org/x/crypto v0.17.0
+	golang.org/x/net v0.19.0
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
 	gorm.io/driver/postgres v1.5.0
 	gorm.io/gorm v1.25.0
 )
@@ -27,26 +31,25 @@ require (
 	cloud.google.com/go/compute v1.14.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/purell v1.2.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/bytedance/sonic v1.8.8 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/bytedance/sonic v1.10.2 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/frankban/quicktest v1.14.4 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/spec v0.20.4 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.4 // indirect
+	github.com/go-openapi/spec v0.20.13 // indirect
+	github.com/go-openapi/swag v0.22.7 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/gorilla/context v1.1.1 // indirect
-	github.com/gorilla/mux v1.6.2 // indirect
-	github.com/gorilla/securecookie v1.1.1 // indirect
-	github.com/gorilla/sessions v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
@@ -55,33 +58,36 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/markbates/goth v1.78.0 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/urfave/cli/v2 v2.27.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
+	golang.org/x/arch v0.6.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.16.1 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )