From d635ba7a25e22e901e4356bac504bb9081db8c21 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Mon, 26 Oct 2026 23:16:56 +0000 Subject: [PATCH] remove replace for common-lib --- app/common/types.go | 2 +- app/common/utils.go | 3 +-- app/main.go | 7 +++---- app/routes.go | 2 +- go.mod | 3 --- proxmoxaas-common-lib | 2 +- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/common/types.go b/app/common/types.go index ae88a7a..ab78552 100644 --- a/app/common/types.go +++ b/app/common/types.go @@ -1,6 +1,6 @@ package app -import paas "proxmoxaas-common-lib" +import paas "access-manager-api/proxmoxaas-common-lib" type Realm struct { Type string diff --git a/app/common/utils.go b/app/common/utils.go index b4f906c..1b5fb8b 100644 --- a/app/common/utils.go +++ b/app/common/utils.go @@ -1,10 +1,9 @@ package app import ( + paas "access-manager-api/proxmoxaas-common-lib" "fmt" "reflect" - - paas "proxmoxaas-common-lib" ) func ParseGroupname(groupname string) (Groupname, error) { diff --git a/app/main.go b/app/main.go index bf9a9c1..6c2d2a5 100644 --- a/app/main.go +++ b/app/main.go @@ -1,6 +1,9 @@ package app import ( + common "access-manager-api/app/common" + "access-manager-api/app/pve" + paas "access-manager-api/proxmoxaas-common-lib" "crypto/rand" "flag" "fmt" @@ -8,10 +11,6 @@ import ( "net/http" "strconv" - common "access-manager-api/app/common" - "access-manager-api/app/pve" - paas "proxmoxaas-common-lib" - "github.com/gorilla/sessions" ) diff --git a/app/routes.go b/app/routes.go index f2e3b54..a7e95a7 100644 --- a/app/routes.go +++ b/app/routes.go @@ -5,10 +5,10 @@ import ( ldap "access-manager-api/app/ldap" "access-manager-api/app/localdb" pve "access-manager-api/app/pve" + paas "access-manager-api/proxmoxaas-common-lib" "encoding/json" "fmt" "net/http" - paas "proxmoxaas-common-lib" "uuid" "github.com/gorilla/sessions" diff --git a/go.mod b/go.mod index 476a4b4..461c691 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,8 @@ require ( github.com/go-ldap/ldap/v3 v3.4.15 github.com/gorilla/sessions v1.4.0 github.com/luthermonson/go-proxmox v0.8.2 - proxmoxaas-common-lib v0.0.0 ) -replace proxmoxaas-common-lib => ./proxmoxaas-common-lib - require ( github.com/Azure/go-ntlmssp v0.1.1 // indirect github.com/buger/goterm v1.0.4 // indirect diff --git a/proxmoxaas-common-lib b/proxmoxaas-common-lib index 8b73652..e7341e3 160000 --- a/proxmoxaas-common-lib +++ b/proxmoxaas-common-lib @@ -1 +1 @@ -Subproject commit 8b73652c9b1b5f9585a3539537991b702589249a +Subproject commit e7341e3d9e9778cc59621050566940e718678cf8