coder
diff --git a/‎cli/deployment/config.go
Lines changed: 8 additions & 0 deletions b/‎cli/deployment/config.go
Lines changed: 8 additions & 0 deletions
diff --git a/‎cli/server.go
Lines changed: 4 additions & 0 deletions b/‎cli/server.go
Lines changed: 4 additions & 0 deletions
diff --git a/‎cli/testdata/coder_server_--help.golden
Lines changed: 2 additions & 0 deletions b/‎cli/testdata/coder_server_--help.golden
Lines changed: 2 additions & 0 deletions
diff --git a/‎coderd/coderd.go
Lines changed: 9 additions & 4 deletions b/‎coderd/coderd.go
Lines changed: 9 additions & 4 deletions
diff --git a/‎codersdk/deploymentconfig.go
Lines changed: 5 additions & 0 deletions b/‎codersdk/deploymentconfig.go
Lines changed: 5 additions & 0 deletions
@@ -430,6 +430,14 @@ func newConfig() *codersdk.DeploymentConfig {
 			Flag:    "max-token-lifetime",
 			Default: 24 * 30 * time.Hour,
 		},
+		Swagger: &codersdk.SwaggerConfig{
+			Enabled: &codersdk.DeploymentConfigField[bool]{
+				Name:    "Enable swagger endpoint",
+				Usage:   "Expose the swagger endpoint via /swagger.",
+				Flag:    "swagger-enabled",
+				Default: flag.Lookup("test.v") == nil && !buildinfo.IsDev(),
+			},
+		},
 	}
 }
 
 
@@ -604,6 +604,10 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 				), cfg.Prometheus.Address.Value, "prometheus")()
 			}
 
+			if cfg.Swagger.Enabled.Value {
+				options.SwaggerEndpointEnabled = cfg.Swagger.Enabled.Value
+			}
+
 			// We use a separate coderAPICloser so the Enterprise API
 			// can have it's own close functions. This is cleaner
 			// than abstracting the Coder API itself.
 
@@ -168,6 +168,8 @@ Flags:
                                                      "ecdsa", or "rsa4096".
                                                      Consumes $CODER_SSH_KEYGEN_ALGORITHM
                                                      (default "ed25519")
+      --swagger-enabled                              Expose the swagger endpoint via /swagger.
+                                                     Consumes $CODER_SWAGGER_ENABLED
       --telemetry                                    Whether telemetry is enabled or not.
                                                      Coder collects anonymized usage data to
                                                      help improve our product.
 
@@ -111,6 +111,8 @@ type Options struct {
 	Experimental                bool
 	DeploymentConfig            *codersdk.DeploymentConfig
 	UpdateCheckOptions          *updatecheck.Options // Set non-nil to enable update checking.
+
+	SwaggerEndpointEnabled bool
 }
 
 // @title Coderd API
@@ -596,10 +598,13 @@ func New(options *Options) *API {
 			})
 		})
 	})
-	// Swagger UI requires the URL trailing slash. Otherwise, the browser tries to load /assets
-	// from http://localhost:8080/assets instead of http://localhost:8080/swagger/assets.
-	r.Get("/swagger", http.RedirectHandler("/swagger/", http.StatusSeeOther).ServeHTTP)
-	r.Get("/swagger/*", httpSwagger.Handler(httpSwagger.URL("/swagger/doc.json")))
+
+	if options.SwaggerEndpointEnabled {
+		// Swagger UI requires the URL trailing slash. Otherwise, the browser tries to load /assets
+		// from http://localhost:8080/assets instead of http://localhost:8080/swagger/assets.
+		r.Get("/swagger", http.RedirectHandler("/swagger/", http.StatusSeeOther).ServeHTTP)
+		r.Get("/swagger/*", httpSwagger.Handler(httpSwagger.URL("/swagger/doc.json")))
+	}
 
 	r.NotFound(compressHandler(http.HandlerFunc(api.siteHandler.ServeHTTP)).ServeHTTP)
 	return api
 
@@ -43,6 +43,7 @@ type DeploymentConfig struct {
 	Experimental                    *DeploymentConfigField[bool]            `json:"experimental" typescript:",notnull"`
 	UpdateCheck                     *DeploymentConfigField[bool]            `json:"update_check" typescript:",notnull"`
 	MaxTokenLifetime                *DeploymentConfigField[time.Duration]   `json:"max_token_lifetime" typescript:",notnull"`
+	Swagger                         *SwaggerConfig                          `json:"swagger" typescript:",notnull"`
 }
 
 type DERP struct {
@@ -141,6 +142,10 @@ type ProvisionerConfig struct {
 	ForceCancelInterval *DeploymentConfigField[time.Duration] `json:"force_cancel_interval" typescript:",notnull"`
 }
 
+type SwaggerConfig struct {
+	Enabled *DeploymentConfigField[bool] `json:"enabled",typescript:",notnull"`
+}
+
 type Flaggable interface {
 	string | time.Duration | bool | int | []string | []GitAuthConfig
 }
Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,14 @@ func newConfig() *codersdk.DeploymentConfig {`
`430`	`430`	`Flag: "max-token-lifetime",`
`431`	`431`	`Default: 24 * 30 * time.Hour,`
`432`	`432`	`},`
	`433`	`+ Swagger: &codersdk.SwaggerConfig{`
	`434`	`+ Enabled: &codersdk.DeploymentConfigField[bool]{`
	`435`	`+ Name: "Enable swagger endpoint",`
	`436`	`+ Usage: "Expose the swagger endpoint via /swagger.",`
	`437`	`+ Flag: "swagger-enabled",`
	`438`	`+ Default: flag.Lookup("test.v") == nil && !buildinfo.IsDev(),`
	`439`	`+ },`
	`440`	`+ },`
`433`	`441`	`}`
`434`	`442`	`}`
`435`	`443`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ type DeploymentConfig struct {`
`43`	`43`	Experimental *DeploymentConfigField[bool] `json:"experimental" typescript:",notnull"`
`44`	`44`	UpdateCheck *DeploymentConfigField[bool] `json:"update_check" typescript:",notnull"`
`45`	`45`	MaxTokenLifetime *DeploymentConfigField[time.Duration] `json:"max_token_lifetime" typescript:",notnull"`
	`46`	+ Swagger *SwaggerConfig `json:"swagger" typescript:",notnull"`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`type DERP struct {`
`@@ -141,6 +142,10 @@ type ProvisionerConfig struct {`
`141`	`142`	ForceCancelInterval *DeploymentConfigField[time.Duration] `json:"force_cancel_interval" typescript:",notnull"`
`142`	`143`	`}`
`143`	`144`
	`145`	`+type SwaggerConfig struct {`
	`146`	+ Enabled *DeploymentConfigField[bool] `json:"enabled",typescript:",notnull"`
	`147`	`+}`
	`148`	`+`
`144`	`149`	`type Flaggable interface {`
`145`	`150`	`string \| time.Duration \| bool \| int \| []string \| []GitAuthConfig`
`146`	`151`	`}`