slurm: change to hostlist from cc-lib

The old archive hostlist resolution does not cover all the necessary
host name schemes requires by Slurm. Neither should we pull packages
directly from cc-backend.

Author: ipatix

go.mod

@@ -5,12 +5,11 @@ go 1.24.0
 toolchain go1.24.4
 
 require (
-	github.com/ClusterCockpit/cc-lib v1.0.2
+	github.com/ClusterCockpit/cc-lib/v2 v2.4.0
 	github.com/nats-io/nats.go v1.48.0
 )
 
 require (
-	github.com/ClusterCockpit/cc-backend v1.4.4 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect

go.sum

@@ -1,7 +1,5 @@
-github.com/ClusterCockpit/cc-backend v1.4.4 h1:Xk87C/2dXRWlQOc7RARtfdiukDAZj+8+k0zFO4AFcvc=
-github.com/ClusterCockpit/cc-backend v1.4.4/go.mod h1:F8O4xSsXk+Ys5XoyQAGQ8noLUGneqNsw7QcClNaa5uo=
-github.com/ClusterCockpit/cc-lib v1.0.2 h1:ZWn3oZkXgxrr3zSigBdlOOfayZ4Om4xL20DhmritPPg=
-github.com/ClusterCockpit/cc-lib v1.0.2/go.mod h1:UGdOvXEnjFqlnPSxtvtFwO6BtXYW6NnXFoud9FtN93k=
+github.com/ClusterCockpit/cc-lib/v2 v2.4.0 h1:OnZlvqSatg7yCQ2NtSR7AddpUVSiuSMZ8scF1a7nfOk=
+github.com/ClusterCockpit/cc-lib/v2 v2.4.0/go.mod h1:JuxMAuEOaLLNEnnL9U3ejha8kMvsSatLdKPZEgJw6iw=
 github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=

internal/cc/interface.go

@@ -20,8 +20,8 @@ import (
 
 	"github.com/nats-io/nats.go"
 
-	"github.com/ClusterCockpit/cc-lib/ccMessage"
-	"github.com/ClusterCockpit/cc-lib/schema"
+	"github.com/ClusterCockpit/cc-lib/v2/ccMessage"
+	"github.com/ClusterCockpit/cc-lib/v2/schema"
 )
 
 type CacheJobState struct {

internal/slurm/common/common.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/ClusterCockpit/cc-slurm-adapter/internal/types"
 
-	"github.com/ClusterCockpit/cc-lib/schema"
+	"github.com/ClusterCockpit/cc-lib/v2/schema"
 )
 
 type Job interface {

internal/slurm/v24xx/slurm.go

@@ -18,8 +18,8 @@ import (
 	"github.com/ClusterCockpit/cc-slurm-adapter/internal/trace"
 	"github.com/ClusterCockpit/cc-slurm-adapter/internal/types"
 
-	"github.com/ClusterCockpit/cc-backend/pkg/archive"
-	"github.com/ClusterCockpit/cc-lib/schema"
+	"github.com/ClusterCockpit/cc-lib/v2/hostlist"
+	"github.com/ClusterCockpit/cc-lib/v2/schema"
 )
 
 // SlurmInt supports these two JSON layouts:
@@ -556,12 +556,12 @@ func GetNodes(job *SacctJob) ([]string, error) {
 		return make([]string, 0), nil
 	}
 
-	nodeList, err := archive.ParseNodeList(*job.Nodes)
+	nodeList, err := hostlist.Expand(*job.Nodes)
 	if err != nil {
 		return nil, fmt.Errorf("Unable to resolve hostname list '%s': %w", *job.Nodes, err)
 	}
 
-	return nodeList.PrintList(), nil
+	return nodeList, nil
 }
 
 func CheckPerms() {

internal/types/types.go

@@ -1,7 +1,7 @@
 package types
 
 import (
-	"github.com/ClusterCockpit/cc-lib/schema"
+	"github.com/ClusterCockpit/cc-lib/v2/schema"
 )
 
 type CCStartJobRequest schema.Job