diff --git a/cmd/apply.go b/cmd/apply.go index d3b49fa..7872045 100644 --- a/cmd/apply.go +++ b/cmd/apply.go @@ -27,7 +27,7 @@ import ( "github.com/grycap/oscar-cli/pkg/cluster" "github.com/grycap/oscar-cli/pkg/config" "github.com/grycap/oscar-cli/pkg/service" - "github.com/grycap/oscar/v2/pkg/types" + "github.com/grycap/oscar/v3/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/service_logs_list.go b/cmd/service_logs_list.go index df4a55f..17d24fe 100644 --- a/cmd/service_logs_list.go +++ b/cmd/service_logs_list.go @@ -24,7 +24,7 @@ import ( "github.com/grycap/oscar-cli/pkg/config" "github.com/grycap/oscar-cli/pkg/service" - "github.com/grycap/oscar/v2/pkg/types" + "github.com/grycap/oscar/v3/pkg/types" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index 3ed563c..5505ba1 100644 --- a/go.mod +++ b/go.mod @@ -8,18 +8,20 @@ require ( github.com/fatih/color v1.14.1 github.com/go-logr/logr v1.2.3 // indirect github.com/goccy/go-yaml v1.9.8 - github.com/grycap/oscar/v2 v2.8.0 github.com/json-iterator/go v1.1.12 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/spf13/cobra v1.5.0 golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/text v0.14.0 // indirect k8s.io/api v0.26.1 // indirect k8s.io/klog/v2 v2.90.0 // indirect ) -require github.com/indigo-dc/liboidcagent-go v0.3.0 +require ( + github.com/grycap/oscar/v3 v3.0.0 + github.com/indigo-dc/liboidcagent-go v0.3.0 +) require ( github.com/adrg/xdg v0.4.0 // indirect @@ -44,9 +46,9 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/crypto v0.14.0 // indirect + golang.org/x/crypto v0.17.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/term v0.13.0 // indirect + golang.org/x/term v0.15.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 64c4b59..a1de35d 100644 --- a/go.sum +++ b/go.sum @@ -93,8 +93,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grycap/cdmi-client-go v0.1.1 h1:kHIrrLhvaCD0VyzEa5HOg7d/VgRE11yh9Ztdyoqii0o= github.com/grycap/cdmi-client-go v0.1.1/go.mod h1:ZqWeQS3YBJVXxg3HOIkAu1MLNJ4+7s848CyIPMFT5Gc= -github.com/grycap/oscar/v2 v2.8.0 h1:SYwGU9gDECuSVUnHlK32YZqgpSd9LBk1TDoALMHe5kI= -github.com/grycap/oscar/v2 v2.8.0/go.mod h1:oDDlTESkRP7gkN3m4Ub9NBQeV29pYy621ZNW0Pe8sAs= +github.com/grycap/oscar/v3 v3.0.0 h1:819hs374xBft73a1Sqd0XzRprjU2f6HKNADcaR/GL1I= +github.com/grycap/oscar/v3 v3.0.0/go.mod h1:Co0108YJh8OJ/Hi3pxTg5kGpE70ukpziYzFKtFiOUUc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= @@ -176,8 +176,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -234,13 +234,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.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.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -248,8 +248,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index bddbc0c..8863747 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -28,7 +28,7 @@ import ( "path" "time" - "github.com/grycap/oscar/v2/pkg/types" + "github.com/grycap/oscar/v3/pkg/types" "github.com/indigo-dc/liboidcagent-go" ) diff --git a/pkg/service/logs.go b/pkg/service/logs.go index 738b5ed..59801e8 100644 --- a/pkg/service/logs.go +++ b/pkg/service/logs.go @@ -24,7 +24,7 @@ import ( "path" "github.com/grycap/oscar-cli/pkg/cluster" - "github.com/grycap/oscar/v2/pkg/types" + "github.com/grycap/oscar/v3/pkg/types" ) const logsPath = "/system/logs" diff --git a/pkg/service/service.go b/pkg/service/service.go index a13d0ee..ce229c4 100644 --- a/pkg/service/service.go +++ b/pkg/service/service.go @@ -32,7 +32,7 @@ import ( "github.com/goccy/go-yaml" "github.com/grycap/oscar-cli/pkg/cluster" - "github.com/grycap/oscar/v2/pkg/types" + "github.com/grycap/oscar/v3/pkg/types" ) const servicesPath = "/system/services" diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index 3cc2140..b3c8d57 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -29,7 +29,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3/s3manager" "github.com/grycap/oscar-cli/pkg/cluster" "github.com/grycap/oscar-cli/pkg/service" - "github.com/grycap/oscar/v2/pkg/types" + "github.com/grycap/oscar/v3/pkg/types" ) func getProvider(providerString string, providers *types.StorageProviders) (interface{}, error) {