Skip to content

Commit 25ef3e4

Browse files
authored
feat(artifacthub): unwrap directories when listing (#186)
Use the new `unwrap_directories` field (added in renderedtext/internal_api#835) in the artifacthub internal API to control the `WrapSubDirectories` behavior in the `storage.ListOptions`. Currently, we hardcoded it to always wrap directories when listing, but in some cases, we need all the files, regardless of them being directly under the path specified, or under one of its subdirectories. ### Other changes I had to update google.golang.org/grpc to v1.71.0 due to the protobuf re-generation.
1 parent be980e1 commit 25ef3e4

File tree

13 files changed

+639
-1272
lines changed

13 files changed

+639
-1272
lines changed

.semaphore/daily-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ blocks:
167167
jobs:
168168
- name: "\U0001F6E1️ Check code"
169169
commands:
170-
- make check.go.code CHECK_CODE_OPTS='--ignores G115'
170+
- make check.go.code CHECK_CODE_OPTS='--config-options "-exclude-generated" --ignores G115'
171171
- name: "\U0001F6E1️ Check dependencies"
172172
commands:
173173
- make check.go.deps

.semaphore/semaphore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ blocks:
180180
jobs:
181181
- name: "\U0001F6E1️ Check code"
182182
commands:
183-
- make check.go.code CHECK_CODE_OPTS='--ignores G115'
183+
- make check.go.code CHECK_CODE_OPTS='--config-options "-exclude-generated" --ignores G115'
184184
- name: "\U0001F6E1️ Check dependencies"
185185
commands:
186186
- make check.go.deps

artifacthub/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ WORKDIR /app
3131
FROM base AS dev
3232

3333
WORKDIR /tmp
34-
RUN curl -sL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip -o protoc && \
34+
RUN curl -sL https://github.com/google/protobuf/releases/download/v3.20.0/protoc-3.20.0-linux-x86_64.zip -o protoc && \
3535
unzip protoc && \
3636
mv bin/protoc /usr/local/bin/protoc
3737

3838
WORKDIR /app
3939
RUN go install github.com/mgechev/revive@latest
4040
RUN go install gotest.tools/gotestsum@latest
4141
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
42+
RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
4243

4344
CMD [ "/bin/bash", "-c \"while sleep 1000; do :; done\"" ]
4445

artifacthub/db/structure.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--
44

55
-- Dumped from database version 9.6.24
6-
-- Dumped by pg_dump version 15.10 (Debian 15.10-0+deb12u1)
6+
-- Dumped by pg_dump version 15.12 (Debian 15.12-0+deb12u2)
77

88
SET statement_timeout = 0;
99
SET lock_timeout = 0;
@@ -133,7 +133,7 @@ ALTER TABLE ONLY public.retention_policies
133133
--
134134

135135
-- Dumped from database version 9.6.24
136-
-- Dumped by pg_dump version 15.10 (Debian 15.10-0+deb12u1)
136+
-- Dumped by pg_dump version 15.12 (Debian 15.12-0+deb12u2)
137137

138138
SET statement_timeout = 0;
139139
SET lock_timeout = 0;

artifacthub/go.mod

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,41 @@
11
module github.com/semaphoreio/semaphore/artifacthub
22

3-
go 1.22
3+
go 1.22.0
4+
5+
toolchain go1.22.7
46

57
require (
68
cloud.google.com/go/storage v1.36.0
79
github.com/aws/aws-sdk-go v1.44.316
810
github.com/blendle/zapdriver v1.3.1
911
github.com/bmatcuk/doublestar/v4 v4.6.0
1012
github.com/golang-jwt/jwt/v5 v5.2.2
11-
github.com/golang/protobuf v1.5.3
13+
github.com/golang/protobuf v1.5.4
1214
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
1315
github.com/renderedtext/go-tackle v0.0.0-20231218124313-26ee274af69d
1416
github.com/renderedtext/go-watchman v0.0.0-20221021124537-3b9fb6245b68
1517
github.com/satori/go.uuid v1.2.0
1618
github.com/spf13/cobra v1.7.0
17-
github.com/stretchr/testify v1.8.4
19+
github.com/stretchr/testify v1.10.0
1820
go.uber.org/zap v1.25.0
1921
google.golang.org/api v0.160.0
20-
google.golang.org/grpc v1.61.1
21-
google.golang.org/protobuf v1.33.0
22+
google.golang.org/grpc v1.71.0
23+
google.golang.org/protobuf v1.36.4
2224
gorm.io/driver/postgres v1.5.2
2325
gorm.io/gorm v1.25.2
2426
)
2527

2628
require (
2729
cloud.google.com/go v0.112.0 // indirect
28-
cloud.google.com/go/compute v1.23.4 // indirect
29-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
30+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
3031
cloud.google.com/go/iam v1.1.6 // indirect
3132
github.com/davecgh/go-spew v1.1.1 // indirect
3233
github.com/felixge/httpsnoop v1.0.4 // indirect
33-
github.com/go-logr/logr v1.4.1 // indirect
34+
github.com/go-logr/logr v1.4.2 // indirect
3435
github.com/go-logr/stdr v1.2.2 // indirect
3536
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3637
github.com/google/s2a-go v0.1.7 // indirect
37-
github.com/google/uuid v1.5.0 // indirect
38+
github.com/google/uuid v1.6.0 // indirect
3839
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
3940
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
4041
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -47,26 +48,25 @@ require (
4748
github.com/jmespath/go-jmespath v0.4.0 // indirect
4849
github.com/pmezard/go-difflib v1.0.0 // indirect
4950
github.com/rabbitmq/amqp091-go v1.9.0 // indirect
50-
github.com/rogpeppe/go-internal v1.11.0 // indirect
5151
github.com/spf13/pflag v1.0.5 // indirect
5252
go.opencensus.io v0.24.0 // indirect
53+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
5354
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
5455
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
55-
go.opentelemetry.io/otel v1.22.0 // indirect
56-
go.opentelemetry.io/otel/metric v1.22.0 // indirect
57-
go.opentelemetry.io/otel/trace v1.22.0 // indirect
56+
go.opentelemetry.io/otel v1.34.0 // indirect
57+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
58+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
5859
go.uber.org/multierr v1.10.0 // indirect
59-
golang.org/x/crypto v0.31.0 // indirect
60-
golang.org/x/net v0.33.0 // indirect
61-
golang.org/x/oauth2 v0.16.0 // indirect
60+
golang.org/x/crypto v0.32.0 // indirect
61+
golang.org/x/net v0.34.0 // indirect
62+
golang.org/x/oauth2 v0.25.0 // indirect
6263
golang.org/x/sync v0.10.0 // indirect
63-
golang.org/x/sys v0.28.0 // indirect
64+
golang.org/x/sys v0.29.0 // indirect
6465
golang.org/x/text v0.21.0 // indirect
6566
golang.org/x/time v0.5.0 // indirect
66-
google.golang.org/appengine v1.6.8 // indirect
6767
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
68-
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
69-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
68+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
69+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
7070
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
7171
gopkg.in/yaml.v3 v3.0.1 // indirect
7272
)

0 commit comments

Comments
 (0)