From 4397e03a0466f1eb8d63fe76a0d6ce8f500b1119 Mon Sep 17 00:00:00 2001 From: Niklas Gehlen Date: Tue, 4 Feb 2025 18:44:21 +0100 Subject: [PATCH] Update integrations dep. (#1388) --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/cli/cmd/cluster/artifact.go | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index ae408b0e3..a618eb26b 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 require ( - buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250131161032-8a8578523eb0.2 + buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250204161447-a582c42d9b87.2 buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.4-20250204141930-c4c13c4d9b38.1 cloud.google.com/go/artifactregistry v1.14.7 cloud.google.com/go/container v1.31.0 @@ -146,7 +146,7 @@ require ( k8s.io/utils v0.0.0-20230726121419-3b25d923346b namespacelabs.dev/go-filenotify v0.0.0-20220511192020-53ea11be7eaa namespacelabs.dev/go-ids v0.0.0-20221124082625-9fc72ee06af7 - namespacelabs.dev/integrations v0.0.0-20250204142845-5bb8f6bdb69c + namespacelabs.dev/integrations v0.0.0-20250204162145-bf23e51e3a44 sigs.k8s.io/controller-runtime v0.16.3 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 3901f2c0c..affbb1084 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250131161032-8a8578523eb0.2 h1:RuzVJUbmKwiyBjtkwt9XWPaMKlm8R8w5IciBoY0U2k8= -buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250131161032-8a8578523eb0.2/go.mod h1:uUnjmdc3oRetP5Bh3ijnjV/3TOlRPPlKaPz685Hfkr8= +buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250204161447-a582c42d9b87.2 h1:xZaUuoPBVmP9ddl+8lXgyHzlTvzt/1XNloJnVQVNT4g= +buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250204161447-a582c42d9b87.2/go.mod h1:pzKw+Wc2QandmD7Psy1MT7r0A7Un3zhDIMh6fQYfHRI= buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.4-20250204141930-c4c13c4d9b38.1 h1:lm/V8iZi88FcR+rXMrHhDmZuspdoVxzORRBAwStFQiM= buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.4-20250204141930-c4c13c4d9b38.1/go.mod h1:BmQXCuQwK4ILUpXnT0ib8261AdDd/OBhxcelMpJb5Bo= c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805 h1:u2qwJeEvnypw+OCPUHmoZE3IqwfuN5kgDfo5MLzpNM0= @@ -1626,8 +1626,8 @@ namespacelabs.dev/go-filenotify v0.0.0-20220511192020-53ea11be7eaa h1:jj2kjs0Hvu namespacelabs.dev/go-filenotify v0.0.0-20220511192020-53ea11be7eaa/go.mod h1:e8NJRaInXRRm1+KPA6EkGEzdLJAgEvVSIKiLzpP97nI= namespacelabs.dev/go-ids v0.0.0-20221124082625-9fc72ee06af7 h1:8NlnfPlzDSJr8TYV/qarIWwhjLd1gOXf3Jme0M/oGBM= namespacelabs.dev/go-ids v0.0.0-20221124082625-9fc72ee06af7/go.mod h1:J+Sd+ngeffnCsaO/M7zgs2bR8Klq/ZBhS0+bbnDEH2M= -namespacelabs.dev/integrations v0.0.0-20250204142845-5bb8f6bdb69c h1:JLjYoA2ijm21tPyvlqgEcnm7jNmGKw5/do8wso127c0= -namespacelabs.dev/integrations v0.0.0-20250204142845-5bb8f6bdb69c/go.mod h1:8Q64hHYJkTX03yUiG9BD0kzr+NA12a+Bca7AnnKQ5Gw= +namespacelabs.dev/integrations v0.0.0-20250204162145-bf23e51e3a44 h1:3I6V424BbgE2abTCFpnIy29YYFSOwICL0Lgu8aV5gaU= +namespacelabs.dev/integrations v0.0.0-20250204162145-bf23e51e3a44/go.mod h1:EKagMwZRHyVu1pfGGzR/2C9j9exM7/aTnsx6wJ5Chs0= oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo= oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/internal/cli/cmd/cluster/artifact.go b/internal/cli/cmd/cluster/artifact.go index e312b6df2..b5e325923 100644 --- a/internal/cli/cmd/cluster/artifact.go +++ b/internal/cli/cmd/cluster/artifact.go @@ -15,8 +15,8 @@ import ( "namespacelabs.dev/foundation/internal/cli/fncobra" "namespacelabs.dev/foundation/internal/console" "namespacelabs.dev/foundation/internal/fnerrors" - "namespacelabs.dev/integrations/nsc/auth" - "namespacelabs.dev/integrations/nsc/storage" + "namespacelabs.dev/integrations/api/storage" + "namespacelabs.dev/integrations/auth" ) func NewArtifactCmd() *cobra.Command { @@ -65,7 +65,7 @@ func newArtifactUploadCmd() *cobra.Command { } defer cli.Close() - if err := cli.UploadArtifact(ctx, dest, namespace, uploadFile); err != nil { + if err := storage.UploadArtifact(ctx, cli, namespace, dest, uploadFile); err != nil { return err } @@ -102,7 +102,7 @@ func newArtifactDownloadCmd() *cobra.Command { } defer cli.Close() - reader, err := cli.DownloadArtifact(ctx, src, namespace) + reader, err := storage.ResolveArtifactStream(ctx, cli, namespace, src) if err != nil { return err }