chore: fix compile and lint issues

ory · Sep 7, 2022 · 81503e0 · 81503e0
1 parent a28bcf1
commit 81503e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/client/sdk_test.go b/client/sdk_test.go
@@ -253,7 +253,7 @@ func TestClientSDK(t *testing.T) {
 		expected := deepcopy.Copy(client).(*models.OAuth2Client)
 		expected.RedirectUris = append(expected.RedirectUris, value)
 
-		result, err := c.Admin.PatchOAuth2Client(admin.NewPatchOAuth2ClientParams().WithID(client.ClientID).WithBody(models.PatchRequest{{Op: &op, Path: &path, Value: value}}))
+		result, err := c.Admin.PatchOAuth2Client(admin.NewPatchOAuth2ClientParams().WithID(client.ClientID).WithBody(models.JSONPatchDocument{{Op: &op, Path: &path, Value: value}}))
 		require.NoError(t, err)
 		expected.CreatedAt = result.Payload.CreatedAt
 		expected.UpdatedAt = result.Payload.UpdatedAt
@@ -272,7 +272,7 @@ func TestClientSDK(t *testing.T) {
 		_, err := c.Admin.CreateOAuth2Client(admin.NewCreateOAuth2ClientParams().WithBody(client))
 		require.NoError(t, err)
 
-		_, err = c.Admin.PatchOAuth2Client(admin.NewPatchOAuth2ClientParams().WithID(client.ClientID).WithBody(models.PatchRequest{{Op: &op, Path: &path, Value: value}}))
+		_, err = c.Admin.PatchOAuth2Client(admin.NewPatchOAuth2ClientParams().WithID(client.ClientID).WithBody(models.JSONPatchDocument{{Op: &op, Path: &path, Value: value}}))
 		require.Error(t, err)
 	})
 
@@ -286,9 +286,9 @@ func TestClientSDK(t *testing.T) {
 		_, err := c.Admin.CreateOAuth2Client(admin.NewCreateOAuth2ClientParams().WithBody(client))
 		require.NoError(t, err)
 
-		result1, err := c.Admin.PatchOAuth2Client(admin.NewPatchOAuth2ClientParams().WithID(client.ClientID).WithBody(models.PatchRequest{{Op: &op, Path: &path, Value: value}}))
+		result1, err := c.Admin.PatchOAuth2Client(admin.NewPatchOAuth2ClientParams().WithID(client.ClientID).WithBody(models.JSONPatchDocument{{Op: &op, Path: &path, Value: value}}))
 		require.NoError(t, err)
-		result2, err := c.Admin.PatchOAuth2Client(admin.NewPatchOAuth2ClientParams().WithID(client.ClientID).WithBody(models.PatchRequest{{Op: &op, Path: &path, Value: value}}))
+		result2, err := c.Admin.PatchOAuth2Client(admin.NewPatchOAuth2ClientParams().WithID(client.ClientID).WithBody(models.JSONPatchDocument{{Op: &op, Path: &path, Value: value}}))
 		require.NoError(t, err)
 
 		// secret hashes shouldn't change between these PUT calls

diff --git a/cmd/server/handler.go b/cmd/server/handler.go
@@ -311,12 +311,12 @@ func serve(
 
 	var tlsConfig *tls.Config
 	if tc := d.Config().TLS(ctx, iface); tc.Enabled() && len(tc.AllowTerminationFrom()) == 0 {
+		// #nosec G402 - This is a false positive because we use graceful.WithDefaults which sets the correct TLS settings.
 		tlsConfig = &tls.Config{Certificates: GetOrCreateTLSCertificate(ctx, cmd, d, iface)}
 	}
 
 	var srv = graceful.WithDefaults(&http.Server{
-		Handler: handler,
-		// #nosec G402 - This is a false positive because we use graceful.WithDefaults which sets the correct TLS settings.
+		Handler:   handler,
 		TLSConfig: tlsConfig,
 	})