edit build.yml - back to base

.gitea/workflows/build.yml

@@ -0,0 +1,72 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    tags:
+      - '*'
+    branches:
+      - main
+      - dev
+
+jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install Docker
+      run: |
+        apt-get update
+        apt-get install -y docker.io
+
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Set Kubernetes Context
+      uses: azure/k8s-set-context@v4
+      with:
+        method: kubeconfig
+        kubeconfig: ${{secrets.buildx_kubeconfig}}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        driver: kubernetes
+        driver-opts: |
+          namespace=gitea
+
+    - name: Login to Docker Registry
+      uses: docker/login-action@v3
+      with:
+        registry: git.coopgo.io
+        username: ${{ secrets.REGISTRY_USER }}
+        password: ${{ secrets.REGISTRY_TOKEN }}
+
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        push: true
+        tags: |
+          git.coopgo.io/${{gitea.repository}}:${{ gitea.ref_name }}
+        flavor: |
+          latest=auto
+        build-args: |		
+          ACCESS_TOKEN_USR=${{gitea.actor}}
+          ACCESS_TOKEN_PWD=${{gitea.token}}
+
+    # BUILD WITH KANIKO
+    # - name: Kaniko build and push
+    #   uses: aevea/action-kaniko@master
+    #   with:
+    #     build_file: Dockerfile
+    #     registry: git.coopgo.io
+    #     username: ${{secrets.registry_user}}
+    #     password: ${{secrets.registry_token}}
+    #     image: ${{gitea.repository}}
+    #     tag: ${{gitea.ref_name}}
+    #     cache: true
+    #     cache_registry: git.coopgo.io/${{gitea.repository}}/cache
+    #     extra-args: |
+    #       ACCESS_TOKEN_USR=${{gitea.actor}}
+    #       ACCESS_TOKEN_PWD=${{gitea.token}}
+          

config.go

@@ -7,23 +7,38 @@ import (
 )
 
 func ReadConfig() (*viper.Viper, error) {
+	// defaults := map[string]any{
+	// 	"name":    "COOPGO Mobility Accounts",
+	// 	"dev_env": false,
+	// 	"storage": map[string]any{
+	// 		"db": map[string]any{
+	// 			"type": "psql",
+	// 			"psql": map[string]any{
+	// 				"user":     "postgres",
+	// 				"password": "postgres",
+	// 				"host":     "localhost",
+	// 				"port":     "5432",
+	// 				"dbname":   "coopgo_platform",
+	// 				"sslmode":  "disable",
+	// 				"schema":   "mobilityaccounts",
+	// 				"tables": map[string]any{
+	// 					"accounts":            "accounts",
+	// 					"accounts_auth_local": "accounts_auth_local",
+	// 				},
+	// 			},
+	// 		},
 	defaults := map[string]any{
 		"name":    "COOPGO Mobility Accounts",
 		"dev_env": false,
 		"storage": map[string]any{
 			"db": map[string]any{
-				"type": "psql",
+				"type": "mongodb",
-				"psql": map[string]any{
+				"mongodb": map[string]any{
-					"user":     "postgres",
-					"password": "postgres",
 					"host":    "localhost",
-					"port":     "5432",
+					"port":    "27017",
-					"dbname":   "coopgo_platform",
+					"db_name": "coopgo_platform",
-					"sslmode":  "disable",
+					"collections": map[string]any{
-					"schema":   "mobilityaccounts",
+						"users": "users",
-					"tables": map[string]any{
-						"accounts":            "accounts",
-						"accounts_auth_local": "accounts_auth_local",
 					},
 				},
 			},

storage/postgresql.go

@@ -129,7 +129,7 @@ func (psql PostgresqlStorage) LocalAuthentication(namespace string, username *st
 		req += fmt.Sprintf(` AND phone_number = '%s'`, *phone_number)
 	}
 	req += ";"
-
+	fmt.Println(req)
 	account.Authentication.Local = &LocalAuth{}
 	err := psql.DbConnection.QueryRow(req).Scan(
 		&account.ID,
@@ -145,18 +145,22 @@ func (psql PostgresqlStorage) LocalAuthentication(namespace string, username *st
 	}
 	err = json.Unmarshal(metadata, &account.Metadata)
 	if err != nil {
+		fmt.Println("one")
 		return nil, err
 	}
 	err = json.Unmarshal(data, &account.Data)
 	if err != nil {
+		fmt.Println("two")
 		return nil, err
 	}
 	err = json.Unmarshal(emailValidation, &account.Authentication.Local.EmailValidation)
 	if err != nil {
+		fmt.Println("three")
 		return nil, err
 	}
 	err = json.Unmarshal(phoneValidation, &account.Authentication.Local.PhoneNumberValidation)
 	if err != nil {
+		fmt.Println("four")
 		return nil, err
 	}
 	return account, nil