do not set default variables for uid/gid

cyverse · Jan 17, 2025 · 68611e3 · 68611e3
1 parent 6f11c9f
commit 68611e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ go 1.21
 require (
 	github.com/container-storage-interface/spec v1.2.0
 	github.com/cyverse/go-irodsclient v0.15.8
-	github.com/cyverse/irodsfs v0.10.2
-	github.com/cyverse/irodsfs-common v0.0.0-20241025231356-4e650ac30aa6
+	github.com/cyverse/irodsfs v0.10.6
+	github.com/cyverse/irodsfs-common v0.0.0-20250108164354-7520cee23f8a
 	github.com/pkg/xattr v0.4.9
 	github.com/prometheus/client_golang v1.13.0
 	github.com/rs/xid v1.3.0
@@ -35,6 +35,7 @@ require (
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
 	golang.org/x/text v0.15.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect

diff --git a/go.sum b/go.sum
@@ -56,10 +56,10 @@ github.com/container-storage-interface/spec v1.2.0 h1:bD9KIVgaVKKkQ/UbVUY9kCaH/C
 github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
 github.com/cyverse/go-irodsclient v0.15.8 h1:ZiO5DDiyTL7+vfhqtNWtZWcHlWO+p6iieWTcLa8zcZA=
 github.com/cyverse/go-irodsclient v0.15.8/go.mod h1:NN+PxHfLDUmsqfqSY84JfmqXS4EYiuiNW6ti6oPGCgk=
-github.com/cyverse/irodsfs v0.10.2 h1:iQJiT3toGGbTF/yCV4q2Rbsb6/OnSF5ChsjX+OERHYs=
-github.com/cyverse/irodsfs v0.10.2/go.mod h1:RetQ3DaEwuMr0p3dGZ2q/Qjui4XjNSzGb8T3Jr+o6ZM=
-github.com/cyverse/irodsfs-common v0.0.0-20241025231356-4e650ac30aa6 h1:/T/JcR11r1dGzExKjrFwLe68zWdtp+HMlib+4cbz3ck=
-github.com/cyverse/irodsfs-common v0.0.0-20241025231356-4e650ac30aa6/go.mod h1:+eZ+/tYP54StOJCchIBUKEmzBip0n32CYOzYr+KXhPM=
+github.com/cyverse/irodsfs v0.10.6 h1:DW7Fwh5qk5DYYaub1U4ZNzxQhKreEPAxPqYoluAeBXw=
+github.com/cyverse/irodsfs v0.10.6/go.mod h1:O56Hg8NRxw6aSBOZjVObqEJENR60/ASIlYX/f53Ldcg=
+github.com/cyverse/irodsfs-common v0.0.0-20250108164354-7520cee23f8a h1:Drpl2QtVyJErxh5euv9VGsSsE5G957ZIpXD+mbSp/4E=
+github.com/cyverse/irodsfs-common v0.0.0-20250108164354-7520cee23f8a/go.mod h1:1KTDsQpja3ir/TQRGCx/rxzSWBCgrb7Y7J4VY8JAXN8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -363,6 +363,8 @@ golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

diff --git a/pkg/client/irods/connection_info.go b/pkg/client/irods/connection_info.go
@@ -246,7 +246,7 @@ func GetConnectionInfo(configs map[string]string) (*IRODSFSConnectionInfo, error
 
 	// correct
 	connInfo.FixAuthConfiguration()
-	err = connInfo.FixSystemSystemUserConfiguration()
+	err = connInfo.FixSystemUserConfiguration()
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "Argument systemuser/uid/gid are not valid - %q", err.Error())
 	}