Skip to content

Commit b97c6a6

Browse files
hugosantoshugosantos
committed
Update namespace/cloud dependency, and update examples/buildandrun to rely on the port endpoint.
1 parent 430aa61 commit b97c6a6

File tree

8 files changed

+22
-25
lines changed

8 files changed

+22
-25
lines changed

‎buildkit/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.23.0
55
toolchain go1.24.1
66

77
require (
8-
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250326140621-ac1d1758c8eb.2
9-
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250326140621-ac1d1758c8eb.1
8+
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250327002427-a1c59b2abe12.2
9+
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250327002427-a1c59b2abe12.1
1010
github.com/moby/buildkit v0.20.1
1111
google.golang.org/grpc v1.71.0
1212
namespacelabs.dev/integrations v0.0.3

‎buildkit/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250326140621-ac1d1758c8eb.2 h1:eZ/Cfb72k5Fms8/HlthF+MjCa9O//4zNLQN6S1P+aIg=
2-
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250326140621-ac1d1758c8eb.1 h1:lQ58V0JYF78XdMRefobCti3HCs5gQrAY2u0rFHNZJSQ=
1+
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250327002427-a1c59b2abe12.2 h1:enAga8+COeYVjQTKbLjbUc+/lLvKqopAkiqL4qJZJfw=
2+
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250327002427-a1c59b2abe12.1 h1:xG4gZjY73sXrS0l+pMRX7UvhpOxPlMWo1LiOdpkuoTw=
33
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
44
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
55
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 h1:dIScnXFlF784X79oi7MzVT6GWqr/W1uUt0pB5CsDs9M=

‎examples/buildandrun/buildandrun.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,19 +197,14 @@ func createInstance(ctx context.Context, debugLog io.Writer, token api.TokenSour
197197
return "", err
198198
}
199199

200-
var target string
200+
var endpoint string
201201
for _, ctr := range resp.Containers {
202202
for _, port := range ctr.ExportedPort {
203-
target = port.Fqdn
204-
fmt.Fprintf(debugLog, " %d -> %s\n", port.ContainerPort, target)
203+
endpoint = port.Endpoint
204+
fmt.Fprintf(debugLog, " %d -> %s\n", port.ContainerPort, port.Endpoint)
205205
}
206206
}
207207

208-
// XXX there's a missing rollout to ensure that the `:444` prefix is present.
209-
if !strings.HasSuffix(target, ":444") {
210-
target += ":444"
211-
}
212-
213208
fmt.Fprintf(debugLog, "Created instance: %s (waiting until it's ready)\n", resp.InstanceUrl)
214209

215210
if _, err := cli.Compute.WaitInstanceSync(ctx, &computepb.WaitInstanceRequest{
@@ -220,7 +215,7 @@ func createInstance(ctx context.Context, debugLog io.Writer, token api.TokenSour
220215

221216
fmt.Fprintf(debugLog, "Instance ready.\n")
222217

223-
return target, nil
218+
return endpoint, nil
224219
}
225220

226221
func callInstance(ctx context.Context, debugLog io.Writer, token api.CertificateSource, target string) error {

‎examples/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.0
55
toolchain go1.24.1
66

77
require (
8-
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250326140621-ac1d1758c8eb.1
8+
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250327002427-a1c59b2abe12.1
99
github.com/docker/cli v28.0.1+incompatible
1010
github.com/moby/buildkit v0.20.1
1111
github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a

‎examples/go.sum

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250326140621-ac1d1758c8eb.1 h1:lQ58V0JYF78XdMRefobCti3HCs5gQrAY2u0rFHNZJSQ=
2-
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250326140621-ac1d1758c8eb.1/go.mod h1:J6KXPNqce753NzqwbCXNeyoMoVR2BQDPCQqJmtjsF/g=
1+
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250327002427-a1c59b2abe12.1 h1:xG4gZjY73sXrS0l+pMRX7UvhpOxPlMWo1LiOdpkuoTw=
32
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
43
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
54
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 h1:dIScnXFlF784X79oi7MzVT6GWqr/W1uUt0pB5CsDs9M=

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.23.0
55
toolchain go1.24.1
66

77
require (
8-
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250326140621-ac1d1758c8eb.2
9-
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250326140621-ac1d1758c8eb.1
8+
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250327002427-a1c59b2abe12.2
9+
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250327002427-a1c59b2abe12.1
1010
cloud.google.com/go/secretmanager v1.11.5
1111
github.com/aws/aws-sdk-go-v2 v1.36.3
1212
github.com/aws/aws-sdk-go-v2/config v1.29.9

‎go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250326140621-ac1d1758c8eb.2 h1:eZ/Cfb72k5Fms8/HlthF+MjCa9O//4zNLQN6S1P+aIg=
2-
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250326140621-ac1d1758c8eb.2/go.mod h1:hRhyted9+uy31eM+Efmq4iepphIWeD5y2E9jE6MRRws=
3-
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250326140621-ac1d1758c8eb.1 h1:lQ58V0JYF78XdMRefobCti3HCs5gQrAY2u0rFHNZJSQ=
4-
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250326140621-ac1d1758c8eb.1/go.mod h1:J6KXPNqce753NzqwbCXNeyoMoVR2BQDPCQqJmtjsF/g=
1+
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250327002427-a1c59b2abe12.2 h1:enAga8+COeYVjQTKbLjbUc+/lLvKqopAkiqL4qJZJfw=
2+
buf.build/gen/go/namespace/cloud/grpc/go v1.5.1-20250327002427-a1c59b2abe12.2/go.mod h1:mhmOokmEp/skaACaKWn0DEPJRf0Tj/wabFROS4U3Q4M=
3+
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250327002427-a1c59b2abe12.1 h1:xG4gZjY73sXrS0l+pMRX7UvhpOxPlMWo1LiOdpkuoTw=
4+
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.6-20250327002427-a1c59b2abe12.1/go.mod h1:J6KXPNqce753NzqwbCXNeyoMoVR2BQDPCQqJmtjsF/g=
55
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
66
cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM=
77
cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4=
@@ -47,6 +47,7 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
4747
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4848
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4949
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
50+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5051
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
5152
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
5253
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -103,6 +104,7 @@ github.com/jxskiss/base62 v1.1.0 h1:A5zbF8v8WXx2xixnAKD2w+abC+sIzYJX+nxmhA6HWFw=
103104
github.com/jxskiss/base62 v1.1.0/go.mod h1:HhWAlUXvxKThfOlZbcuFzsqwtF5TcqS9ru3y5GfjWAc=
104105
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
105106
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
107+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
106108
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
107109
github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c=
108110
github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=

‎go.work.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.1-20250319174257-d2fbf17db2b5.1/go.mod h1:yEfFbF0z7upec777gWAKvoWu6O0CJ8XqoSIjUAZtiG0=
22
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.1-20250326140621-ac1d1758c8eb.1/go.mod h1:yEfFbF0z7upec777gWAKvoWu6O0CJ8XqoSIjUAZtiG0=
3+
buf.build/gen/go/namespace/cloud/protocolbuffers/go v1.36.1-20250327002427-a1c59b2abe12.1/go.mod h1:yEfFbF0z7upec777gWAKvoWu6O0CJ8XqoSIjUAZtiG0=
34
cel.dev/expr v0.16.2/go.mod h1:gXngZQMkWJoSbE8mOzehJlXQyubn/Vg0vR9/F3W7iw8=
45
cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4=
56
cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
@@ -362,7 +363,6 @@ github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
362363
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
363364
github.com/danieljoos/wincred v1.2.1 h1:dl9cBrupW8+r5250DYkYxocLeZ1Y4vB1kxgtjxw8GQs=
364365
github.com/danieljoos/wincred v1.2.1/go.mod h1:uGaFL9fDn3OLTvzCGulzE+SzjEe5NGlh5FdCcyfPwps=
365-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
366366
github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
367367
github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
368368
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=
@@ -528,7 +528,6 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
528528
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
529529
github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
530530
github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
531-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
532531
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
533532
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
534533
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
@@ -685,6 +684,7 @@ golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
685684
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
686685
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
687686
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
687+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
688688
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
689689
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
690690
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -708,6 +708,7 @@ golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
708708
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
709709
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
710710
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
711+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
711712
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY=
712713
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
713714
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
@@ -722,14 +723,14 @@ golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
722723
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
723724
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
724725
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
725-
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
726726
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
727727
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
728728
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
729729
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
730730
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
731731
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
732732
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
733+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
733734
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
734735
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
735736
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

0 commit comments

Comments
 (0)