Skip to content

Commit 91aedb5

Browse files
committed
Merge remote-tracking branch 'origin/main' into kacpersaw/feat-coder-attach-database
# Conflicts: # coderd/database/queries.sql.go
2 parents 53094ad + 331f85e commit 91aedb5

File tree

13 files changed

+295
-398
lines changed

13 files changed

+295
-398
lines changed

.github/workflows/release.yaml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -641,20 +641,21 @@ jobs:
641641
642642
version="$(./scripts/version.sh)"
643643
644-
binaries=(
645-
"coder-darwin-amd64"
646-
"coder-darwin-arm64"
647-
"coder-linux-amd64"
648-
"coder-linux-arm64"
649-
"coder-linux-armv7"
650-
"coder-windows-amd64.exe"
651-
"coder-windows-arm64.exe"
652-
)
653-
654-
for binary in "${binaries[@]}"; do
655-
detached_signature="${binary}.asc"
656-
gcloud storage cp "./site/out/bin/${binary}" "gs://releases.coder.com/coder-cli/${version}/${binary}"
657-
gcloud storage cp "./site/out/bin/${detached_signature}" "gs://releases.coder.com/coder-cli/${version}/${detached_signature}"
644+
# Source array of slim binaries
645+
declare -A binaries
646+
binaries["coder-darwin-amd64"]="coder-slim_${version}_darwin_amd64"
647+
binaries["coder-darwin-arm64"]="coder-slim_${version}_darwin_arm64"
648+
binaries["coder-linux-amd64"]="coder-slim_${version}_linux_amd64"
649+
binaries["coder-linux-arm64"]="coder-slim_${version}_linux_arm64"
650+
binaries["coder-linux-armv7"]="coder-slim_${version}_linux_armv7"
651+
binaries["coder-windows-amd64.exe"]="coder-slim_${version}_windows_amd64.exe"
652+
binaries["coder-windows-arm64.exe"]="coder-slim_${version}_windows_arm64.exe"
653+
654+
for cli_name in "${!binaries[@]}"; do
655+
slim_binary="${binaries[$cli_name]}"
656+
detached_signature="${slim_binary}.asc"
657+
gcloud storage cp "./build/${slim_binary}" "gs://releases.coder.com/coder-cli/${version}/${cli_name}"
658+
gcloud storage cp "./build/${detached_signature}" "gs://releases.coder.com/coder-cli/${version}/${cli_name}.asc"
658659
done
659660
660661
- name: Publish release

coderd/database/dbauthz/dbauthz.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,17 +2178,6 @@ func (q *querier) GetLatestWorkspaceBuildByWorkspaceID(ctx context.Context, work
21782178
return q.db.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspaceID)
21792179
}
21802180

2181-
func (q *querier) GetLatestWorkspaceBuilds(ctx context.Context) ([]database.WorkspaceBuild, error) {
2182-
// This function is a system function until we implement a join for workspace builds.
2183-
// This is because we need to query for all related workspaces to the returned builds.
2184-
// This is a very inefficient method of fetching the latest workspace builds.
2185-
// We should just join the rbac properties.
2186-
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
2187-
return nil, err
2188-
}
2189-
return q.db.GetLatestWorkspaceBuilds(ctx)
2190-
}
2191-
21922181
func (q *querier) GetLatestWorkspaceBuildsByWorkspaceIDs(ctx context.Context, ids []uuid.UUID) ([]database.WorkspaceBuild, error) {
21932182
// This function is a system function until we implement a join for workspace builds.
21942183
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {

coderd/database/dbauthz/dbauthz_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4045,12 +4045,6 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40454045
LoginType: l.LoginType,
40464046
}).Asserts(rbac.ResourceSystem, policy.ActionRead).Returns(l)
40474047
}))
4048-
s.Run("GetLatestWorkspaceBuilds", s.Subtest(func(db database.Store, check *expects) {
4049-
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
4050-
dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{})
4051-
dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{})
4052-
check.Args().Asserts(rbac.ResourceSystem, policy.ActionRead)
4053-
}))
40544048
s.Run("GetActiveUserCount", s.Subtest(func(db database.Store, check *expects) {
40554049
check.Args(false).Asserts(rbac.ResourceSystem, policy.ActionRead).Returns(int64(0))
40564050
}))

coderd/database/dbmetrics/querymetrics.go

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/dbmock/dbmock.go

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/querier.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy