Fix: SwaggerEndpoint

mtojek · mtojek · commit 82a680dd49b5 · 2022-12-16T13:18:06.000+01:00
diff --git a/cli/server.go b/cli/server.go
@@ -679,7 +679,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 			}
 
 			if cfg.Swagger.Enable.Value {
-				options.SwaggerEndpointEnable = cfg.Swagger.Enable.Value
+				options.SwaggerEndpoint = cfg.Swagger.Enable.Value
 			}
 
 			// We use a separate coderAPICloser so the Enterprise API
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -102,11 +102,11 @@ type Options struct {
 	RealIPConfig         *httpmw.RealIPConfig
 	TrialGenerator       func(ctx context.Context, email string) error
 	// TLSCertificates is used to mesh DERP servers securely.
-	TLSCertificates       []tls.Certificate
-	TailnetCoordinator    tailnet.Coordinator
-	DERPServer            *derp.Server
-	DERPMap               *tailcfg.DERPMap
-	SwaggerEndpointEnable bool
+	TLSCertificates    []tls.Certificate
+	TailnetCoordinator tailnet.Coordinator
+	DERPServer         *derp.Server
+	DERPMap            *tailcfg.DERPMap
+	SwaggerEndpoint    bool
 
 	MetricsCacheRefreshInterval time.Duration
 	AgentStatsRefreshInterval   time.Duration
@@ -601,7 +601,7 @@ func New(options *Options) *API {
 		})
 	})
 
-	if options.SwaggerEndpointEnable {
+	if options.SwaggerEndpoint {
 		// 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.StatusTemporaryRedirect).ServeHTTP)
diff --git a/coderd/coderd_test.go b/coderd/coderd_test.go
@@ -138,7 +138,7 @@ func TestSwagger(t *testing.T) {
 		t.Parallel()
 
 		client := coderdtest.New(t, &coderdtest.Options{
-			SwaggerEndpointEnabled: true,
+			SwaggerEndpoint: true,
 		})
 
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
@@ -157,7 +157,7 @@ func TestSwagger(t *testing.T) {
 		t.Parallel()
 
 		client := coderdtest.New(t, &coderdtest.Options{
-			SwaggerEndpointEnabled: true,
+			SwaggerEndpoint: true,
 		})
 
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -116,7 +116,7 @@ type Options struct {
 	Database database.Store
 	Pubsub   database.Pubsub
 
-	SwaggerEndpointEnabled bool
+	SwaggerEndpoint bool
 }
 
 // New constructs a codersdk client connected to an in-memory API instance.
@@ -299,7 +299,7 @@ func NewOptions(t *testing.T, options *Options) (func(http.Handler), context.Can
 			AgentStatsRefreshInterval:   options.AgentStatsRefreshInterval,
 			DeploymentConfig:            options.DeploymentConfig,
 			UpdateCheckOptions:          options.UpdateCheckOptions,
-			SwaggerEndpointEnable:       options.SwaggerEndpointEnabled,
+			SwaggerEndpoint:             options.SwaggerEndpoint,
 		}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ func Server(vip viper.Viper, newAPI func(context.Context, coderd.Options) (*co`
`679`	`679`	`}`
`680`	`680`
`681`	`681`	`if cfg.Swagger.Enable.Value {`
`682`		`- options.SwaggerEndpointEnable = cfg.Swagger.Enable.Value`
	`682`	`+ options.SwaggerEndpoint = cfg.Swagger.Enable.Value`
`683`	`683`	`}`
`684`	`684`
`685`	`685`	`// We use a separate coderAPICloser so the Enterprise API`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ type Options struct {`
`116`	`116`	`Database database.Store`
`117`	`117`	`Pubsub database.Pubsub`
`118`	`118`
`119`		`- SwaggerEndpointEnabled bool`
	`119`	`+ SwaggerEndpoint bool`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`// New constructs a codersdk client connected to an in-memory API instance.`
`@@ -299,7 +299,7 @@ func NewOptions(t testing.T, options Options) (func(http.Handler), context.Can`
`299`	`299`	`AgentStatsRefreshInterval: options.AgentStatsRefreshInterval,`
`300`	`300`	`DeploymentConfig: options.DeploymentConfig,`
`301`	`301`	`UpdateCheckOptions: options.UpdateCheckOptions,`
`302`		`- SwaggerEndpointEnable: options.SwaggerEndpointEnabled,`
	`302`	`+ SwaggerEndpoint: options.SwaggerEndpoint,`
`303`	`303`	`}`
`304`	`304`	`}`
`305`	`305`