From 360b5ce07cf39230334c71fe7110cce87cdd2522 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 31 Mar 2023 12:37:07 +0200 Subject: [PATCH 1/2] WIP --- .github/workflows/ci.yaml | 2 +- dogfood/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cc8043204835b..b377a9da3ee7a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -174,7 +174,7 @@ jobs: - name: Install sqlc run: | - curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.16.0/sqlc_1.16.0_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc + curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.17.2/sqlc_1.17.2_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc - name: Install protoc-gen-go run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26 - name: Install protoc-gen-go-drpc diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 8e2717405d852..64b9aa07cf443 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -53,7 +53,7 @@ RUN mkdir --parents "$GOPATH" && \ # charts and values files go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.5.0 && \ # sqlc for Go code generation - go install github.com/kyleconroy/sqlc/cmd/sqlc@v1.16.0 && \ + go install github.com/kyleconroy/sqlc/cmd/sqlc@v1.17.2 && \ # gcr-cleaner-cli used by CI to prune unused images go install github.com/sethvargo/gcr-cleaner/cmd/gcr-cleaner-cli@v0.5.1 && \ # ruleguard for checking custom rules, without needing to run all of From e325e739b4cb72eb2dc7ce72610c0db45b22610a Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 31 Mar 2023 12:44:07 +0200 Subject: [PATCH 2/2] chore: Update sqlc to v1.17.2 --- coderd/database/models.go | 40 +++++++++++++++++----------------- coderd/database/querier.go | 2 +- coderd/database/queries.sql.go | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/coderd/database/models.go b/coderd/database/models.go index 82ade2f95c96e..0a929ae07005f 100644 --- a/coderd/database/models.go +++ b/coderd/database/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.17.2 package database @@ -56,7 +56,7 @@ func (ns NullAPIKeyScope) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.APIKeyScope, nil + return string(ns.APIKeyScope), nil } func (e APIKeyScope) Valid() bool { @@ -115,7 +115,7 @@ func (ns NullAppSharingLevel) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.AppSharingLevel, nil + return string(ns.AppSharingLevel), nil } func (e AppSharingLevel) Valid() bool { @@ -180,7 +180,7 @@ func (ns NullAuditAction) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.AuditAction, nil + return string(ns.AuditAction), nil } func (e AuditAction) Valid() bool { @@ -249,7 +249,7 @@ func (ns NullBuildReason) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.BuildReason, nil + return string(ns.BuildReason), nil } func (e BuildReason) Valid() bool { @@ -312,7 +312,7 @@ func (ns NullLogLevel) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.LogLevel, nil + return string(ns.LogLevel), nil } func (e LogLevel) Valid() bool { @@ -376,7 +376,7 @@ func (ns NullLogSource) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.LogSource, nil + return string(ns.LogSource), nil } func (e LogSource) Valid() bool { @@ -436,7 +436,7 @@ func (ns NullLoginType) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.LoginType, nil + return string(ns.LoginType), nil } func (e LoginType) Valid() bool { @@ -499,7 +499,7 @@ func (ns NullParameterDestinationScheme) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.ParameterDestinationScheme, nil + return string(ns.ParameterDestinationScheme), nil } func (e ParameterDestinationScheme) Valid() bool { @@ -560,7 +560,7 @@ func (ns NullParameterScope) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.ParameterScope, nil + return string(ns.ParameterScope), nil } func (e ParameterScope) Valid() bool { @@ -620,7 +620,7 @@ func (ns NullParameterSourceScheme) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.ParameterSourceScheme, nil + return string(ns.ParameterSourceScheme), nil } func (e ParameterSourceScheme) Valid() bool { @@ -678,7 +678,7 @@ func (ns NullParameterTypeSystem) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.ParameterTypeSystem, nil + return string(ns.ParameterTypeSystem), nil } func (e ParameterTypeSystem) Valid() bool { @@ -737,7 +737,7 @@ func (ns NullProvisionerJobType) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.ProvisionerJobType, nil + return string(ns.ProvisionerJobType), nil } func (e ProvisionerJobType) Valid() bool { @@ -796,7 +796,7 @@ func (ns NullProvisionerStorageMethod) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.ProvisionerStorageMethod, nil + return string(ns.ProvisionerStorageMethod), nil } func (e ProvisionerStorageMethod) Valid() bool { @@ -852,7 +852,7 @@ func (ns NullProvisionerType) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.ProvisionerType, nil + return string(ns.ProvisionerType), nil } func (e ProvisionerType) Valid() bool { @@ -918,7 +918,7 @@ func (ns NullResourceType) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.ResourceType, nil + return string(ns.ResourceType), nil } func (e ResourceType) Valid() bool { @@ -992,7 +992,7 @@ func (ns NullUserStatus) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.UserStatus, nil + return string(ns.UserStatus), nil } func (e UserStatus) Valid() bool { @@ -1057,7 +1057,7 @@ func (ns NullWorkspaceAgentLifecycleState) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.WorkspaceAgentLifecycleState, nil + return string(ns.WorkspaceAgentLifecycleState), nil } func (e WorkspaceAgentLifecycleState) Valid() bool { @@ -1131,7 +1131,7 @@ func (ns NullWorkspaceAppHealth) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.WorkspaceAppHealth, nil + return string(ns.WorkspaceAppHealth), nil } func (e WorkspaceAppHealth) Valid() bool { @@ -1194,7 +1194,7 @@ func (ns NullWorkspaceTransition) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.WorkspaceTransition, nil + return string(ns.WorkspaceTransition), nil } func (e WorkspaceTransition) Valid() bool { diff --git a/coderd/database/querier.go b/coderd/database/querier.go index 4ef49a931fbf4..bdd370acca17f 100644 --- a/coderd/database/querier.go +++ b/coderd/database/querier.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.17.2 package database diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 669c5b7a474d1..49e6a95489196 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.17.2 package database