Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a42ce7d

Browse files
EmyrkEmyrk
authored
Merge branch 'main' into stevenmasley/idp_sync_safe_ref
2 parents 8494aa9 + 71dbd0c commit a42ce7d

File tree

147 files changed

+3254
-631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+3254
-631
lines changed

‎Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -813,8 +813,8 @@ coderd/apidoc/swagger.json: site/node_modules/.installed coderd/apidoc/.gen
813813
touch "$@"
814814

815815
update-golden-files:
816-
echo 'WARNING: This target is deprecated. Use "make gen/golden-files" instead.' 2>&1
817-
echo 'Running "make gen/golden-files"' 2>&1
816+
echo 'WARNING: This target is deprecated. Use "make gen/golden-files" instead.' >&2
817+
echo 'Running "make gen/golden-files"' >&2
818818
make gen/golden-files
819819
.PHONY: update-golden-files
820820

@@ -834,39 +834,39 @@ clean/golden-files:
834834
.PHONY: clean/golden-files
835835

836836
cli/testdata/.gen-golden: $(wildcard cli/testdata/*.golden) $(wildcard cli/*.tpl) $(GO_SRC_FILES) $(wildcard cli/*_test.go)
837-
go test ./cli -run="Test(CommandHelp|ServerYAML|ErrorExamples|.*Golden)" -update
837+
TZ=UTC go test ./cli -run="Test(CommandHelp|ServerYAML|ErrorExamples|.*Golden)" -update
838838
touch "$@"
839839

840840
enterprise/cli/testdata/.gen-golden: $(wildcard enterprise/cli/testdata/*.golden) $(wildcard cli/*.tpl) $(GO_SRC_FILES) $(wildcard enterprise/cli/*_test.go)
841-
go test ./enterprise/cli -run="TestEnterpriseCommandHelp" -update
841+
TZ=UTC go test ./enterprise/cli -run="TestEnterpriseCommandHelp" -update
842842
touch "$@"
843843

844844
tailnet/testdata/.gen-golden: $(wildcard tailnet/testdata/*.golden.html) $(GO_SRC_FILES) $(wildcard tailnet/*_test.go)
845-
go test ./tailnet -run="TestDebugTemplate" -update
845+
TZ=UTC go test ./tailnet -run="TestDebugTemplate" -update
846846
touch "$@"
847847

848848
enterprise/tailnet/testdata/.gen-golden: $(wildcard enterprise/tailnet/testdata/*.golden.html) $(GO_SRC_FILES) $(wildcard enterprise/tailnet/*_test.go)
849-
go test ./enterprise/tailnet -run="TestDebugTemplate" -update
849+
TZ=UTC go test ./enterprise/tailnet -run="TestDebugTemplate" -update
850850
touch "$@"
851851

852852
helm/coder/tests/testdata/.gen-golden: $(wildcard helm/coder/tests/testdata/*.yaml) $(wildcard helm/coder/tests/testdata/*.golden) $(GO_SRC_FILES) $(wildcard helm/coder/tests/*_test.go)
853-
go test ./helm/coder/tests -run=TestUpdateGoldenFiles -update
853+
TZ=UTC go test ./helm/coder/tests -run=TestUpdateGoldenFiles -update
854854
touch "$@"
855855

856856
helm/provisioner/tests/testdata/.gen-golden: $(wildcard helm/provisioner/tests/testdata/*.yaml) $(wildcard helm/provisioner/tests/testdata/*.golden) $(GO_SRC_FILES) $(wildcard helm/provisioner/tests/*_test.go)
857-
go test ./helm/provisioner/tests -run=TestUpdateGoldenFiles -update
857+
TZ=UTC go test ./helm/provisioner/tests -run=TestUpdateGoldenFiles -update
858858
touch "$@"
859859

860860
coderd/.gen-golden: $(wildcard coderd/testdata/*/*.golden) $(GO_SRC_FILES) $(wildcard coderd/*_test.go)
861-
go test ./coderd -run="Test.*Golden$$" -update
861+
TZ=UTC go test ./coderd -run="Test.*Golden$$" -update
862862
touch "$@"
863863

864864
coderd/notifications/.gen-golden: $(wildcard coderd/notifications/testdata/*/*.golden) $(GO_SRC_FILES) $(wildcard coderd/notifications/*_test.go)
865-
go test ./coderd/notifications -run="Test.*Golden$$" -update
865+
TZ=UTC go test ./coderd/notifications -run="Test.*Golden$$" -update
866866
touch "$@"
867867

868868
provisioner/terraform/testdata/.gen-golden: $(wildcard provisioner/terraform/testdata/*/*.golden) $(GO_SRC_FILES) $(wildcard provisioner/terraform/*_test.go)
869-
go test ./provisioner/terraform -run="Test.*Golden$$" -update
869+
TZ=UTC go test ./provisioner/terraform -run="Test.*Golden$$" -update
870870
touch "$@"
871871

872872
provisioner/terraform/testdata/version:

‎agent/ls.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,14 @@ func listFiles(query LSRequest) (LSResponse, error) {
125125
}
126126

127127
func listDrives() (LSResponse, error) {
128+
// disk.Partitions() will return partitions even if there was a failure to
129+
// get one. Any errored partitions will not be returned.
128130
partitionStats, err := disk.Partitions(true)
129-
if err != nil {
131+
if err != nil && len(partitionStats) == 0 {
132+
// Only return the error if there were no partitions returned.
130133
return LSResponse{}, xerrors.Errorf("failed to get partitions: %w", err)
131134
}
135+
132136
contents := make([]LSFile, 0, len(partitionStats))
133137
for _, a := range partitionStats {
134138
// Drive letters on Windows have a trailing separator as part of their name.

‎cli/server.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2160,6 +2160,8 @@ func startBuiltinPostgres(ctx context.Context, cfg config.Root, logger slog.Logg
21602160
embeddedpostgres.DefaultConfig().
21612161
Version(embeddedpostgres.V13).
21622162
BinariesPath(filepath.Join(cfg.PostgresPath(), "bin")).
2163+
// Default BinaryRepositoryURL repo1.maven.org is flaky.
2164+
BinaryRepositoryURL("https://repo.maven.apache.org/maven2").
21632165
DataPath(filepath.Join(cfg.PostgresPath(), "data")).
21642166
RuntimePath(filepath.Join(cfg.PostgresPath(), "runtime")).
21652167
CachePath(cachePath).

‎coderd/apidoc/docs.go

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

‎coderd/apidoc/swagger.json

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

‎coderd/coderd.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,10 +1108,6 @@ func New(options *Options) *API {
11081108
// The idea is to return an empty [], so that the coder CLI won't get blocked accidentally.
11091109
r.Get("/schema", templateVersionSchemaDeprecated)
11101110
r.Get("/parameters", templateVersionParametersDeprecated)
1111-
r.Group(func(r chi.Router) {
1112-
r.Use(httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentDynamicParameters))
1113-
r.Get("/dynamic-parameters", api.templateVersionDynamicParameters)
1114-
})
11151111
r.Get("/rich-parameters", api.templateVersionRichParameters)
11161112
r.Get("/external-auth", api.templateVersionExternalAuth)
11171113
r.Get("/variables", api.templateVersionVariables)
@@ -1177,6 +1173,17 @@ func New(options *Options) *API {
11771173
// organization member. This endpoint should match the authz story of
11781174
// postWorkspacesByOrganization
11791175
r.Post("/workspaces", api.postUserWorkspaces)
1176+
1177+
// Similarly to creating a workspace, evaluating parameters for a
1178+
// new workspace should also match the authz story of
1179+
// postWorkspacesByOrganization
1180+
r.Route("/templateversions/{templateversion}", func(r chi.Router) {
1181+
r.Use(
1182+
httpmw.ExtractTemplateVersionParam(options.Database),
1183+
httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentDynamicParameters),
1184+
)
1185+
r.Get("/parameters", api.templateVersionDynamicParameters)
1186+
})
11801187
})
11811188

11821189
r.Group(func(r chi.Router) {
@@ -1809,10 +1816,10 @@ func ReadExperiments(log slog.Logger, raw []string) codersdk.Experiments {
18091816
for _, v := range raw {
18101817
switch v {
18111818
case "*":
1812-
exps = append(exps, codersdk.ExperimentsAll...)
1819+
exps = append(exps, codersdk.ExperimentsSafe...)
18131820
default:
18141821
ex := codersdk.Experiment(strings.ToLower(v))
1815-
if !slice.Contains(codersdk.ExperimentsAll, ex) {
1822+
if !slice.Contains(codersdk.ExperimentsSafe, ex) {
18161823
log.Warn(context.Background(), "🐉 HERE BE DRAGONS: opting into hidden experiment", slog.F("experiment", ex))
18171824
}
18181825
exps = append(exps, ex)

‎coderd/experiments.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ func (api *API) handleExperimentsGet(rw http.ResponseWriter, r *http.Request) {
2929
func handleExperimentsSafe(rw http.ResponseWriter, r *http.Request) {
3030
ctx := r.Context()
3131
httpapi.Write(ctx, rw, http.StatusOK, codersdk.AvailableExperiments{
32-
Safe: codersdk.ExperimentsAll,
32+
Safe: codersdk.ExperimentsSafe,
3333
})
3434
}

‎coderd/experiments_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ func Test_Experiments(t *testing.T) {
6969
experiments, err := client.Experiments(ctx)
7070
require.NoError(t, err)
7171
require.NotNil(t, experiments)
72-
require.ElementsMatch(t, codersdk.ExperimentsAll, experiments)
73-
for _, ex := range codersdk.ExperimentsAll {
72+
require.ElementsMatch(t, codersdk.ExperimentsSafe, experiments)
73+
for _, ex := range codersdk.ExperimentsSafe {
7474
require.True(t, experiments.Enabled(ex))
7575
}
7676
require.False(t, experiments.Enabled("danger"))
@@ -91,8 +91,8 @@ func Test_Experiments(t *testing.T) {
9191
experiments, err := client.Experiments(ctx)
9292
require.NoError(t, err)
9393
require.NotNil(t, experiments)
94-
require.ElementsMatch(t, append(codersdk.ExperimentsAll, "danger"), experiments)
95-
for _, ex := range codersdk.ExperimentsAll {
94+
require.ElementsMatch(t, append(codersdk.ExperimentsSafe, "danger"), experiments)
95+
for _, ex := range codersdk.ExperimentsSafe {
9696
require.True(t, experiments.Enabled(ex))
9797
}
9898
require.True(t, experiments.Enabled("danger"))
@@ -131,6 +131,6 @@ func Test_Experiments(t *testing.T) {
131131
experiments, err := client.SafeExperiments(ctx)
132132
require.NoError(t, err)
133133
require.NotNil(t, experiments)
134-
require.ElementsMatch(t, codersdk.ExperimentsAll, experiments.Safe)
134+
require.ElementsMatch(t, codersdk.ExperimentsSafe, experiments.Safe)
135135
})
136136
}

0 commit comments

Comments
 (0)