fix(client): update snapshot and fix import ordering

panbanda · panbanda · commit a848a7115c07 · 2025-12-11T13:21:39.000-07:00
Remove contacts field from snapshot to match omitempty serialization
and fix goimports ordering in oryx package files to pass CI format
check.
diff --git a/client/.snapshots/TestHandler-common-case=fetching_existing_client-endpoint=admin.json b/client/.snapshots/TestHandler-common-case=fetching_existing_client-endpoint=admin.json
@@ -10,7 +10,6 @@
     "audience": [],
     "owner": "",
     "allowed_cors_origins": [],
-    "contacts": [],
     "client_secret_expires_at": 0,
     "subject_type": "public",
     "jwks": {},
diff --git a/client/.snapshots/TestHandler-common-case=fetching_existing_client-endpoint=selfservice.json b/client/.snapshots/TestHandler-common-case=fetching_existing_client-endpoint=selfservice.json
@@ -10,7 +10,6 @@
     "audience": [],
     "owner": "",
     "allowed_cors_origins": [],
-    "contacts": [],
     "client_secret_expires_at": 0,
     "subject_type": "public",
     "jwks": {},
diff --git a/client/.snapshots/TestHandler-common-case=update_the_lifespans_of_an_OAuth2_client.json b/client/.snapshots/TestHandler-common-case=update_the_lifespans_of_an_OAuth2_client.json
@@ -10,7 +10,6 @@
     "audience": [],
     "owner": "",
     "allowed_cors_origins": [],
-    "contacts": [],
     "client_secret_expires_at": 0,
     "subject_type": "public",
     "jwks": {},
diff --git a/cmd/.snapshots/TestGetClient-case=gets_client.json b/cmd/.snapshots/TestGetClient-case=gets_client.json
@@ -7,6 +7,5 @@
   "scope": "",
   "skip_consent": false,
   "subject_type": "",
-  "token_endpoint_auth_method": "client_secret_post",
-  "tos_uri": ""
+  "token_endpoint_auth_method": "client_secret_post"
 }
diff --git a/cmd/.snapshots/TestGetClient-case=gets_multiple_clients.json b/cmd/.snapshots/TestGetClient-case=gets_multiple_clients.json
@@ -4,7 +4,6 @@
     "audience": [],
     "client_name": "",
     "client_secret_expires_at": 0,
-    "contacts": [],
     "grant_types": [],
     "jwks": {},
     "metadata": {},
@@ -14,15 +13,13 @@
     "scope": "",
     "skip_consent": false,
     "subject_type": "",
-    "token_endpoint_auth_method": "client_secret_post",
-    "tos_uri": ""
+    "token_endpoint_auth_method": "client_secret_post"
   },
   {
     "allowed_cors_origins": [],
     "audience": [],
     "client_name": "",
     "client_secret_expires_at": 0,
-    "contacts": [],
     "grant_types": [],
     "jwks": {},
     "metadata": {},
@@ -32,7 +29,6 @@
     "scope": "",
     "skip_consent": false,
     "subject_type": "",
-    "token_endpoint_auth_method": "client_secret_post",
-    "tos_uri": ""
+    "token_endpoint_auth_method": "client_secret_post"
   }
 ]
diff --git a/oauth2/.snapshots/TestAuthCodeFlowE2E-auth_code_flow-strategy=jwt-access_and_id_tokens_with_extra_claims_consent_request.json b/oauth2/.snapshots/TestAuthCodeFlowE2E-auth_code_flow-strategy=jwt-access_and_id_tokens_with_extra_claims_consent_request.json
@@ -14,7 +14,6 @@
     "client_id": "64f78bf1-f388-4eeb-9fee-e7207226c6be-jwt",
     "client_name": "",
     "client_secret_expires_at": 0,
-    "contacts": [],
     "grant_types": [
       "implicit",
       "refresh_token",
@@ -35,8 +34,7 @@
     ],
     "scope": "hydra offline openid",
     "skip_consent": false,
-    "subject_type": "",
-    "tos_uri": ""
+    "subject_type": ""
   },
   "oidc_context": {},
   "requested_access_token_audience": [],
diff --git a/oauth2/.snapshots/TestAuthCodeFlowE2E-auth_code_flow-strategy=jwt-access_and_id_tokens_with_extra_claims_login_request.json b/oauth2/.snapshots/TestAuthCodeFlowE2E-auth_code_flow-strategy=jwt-access_and_id_tokens_with_extra_claims_login_request.json
@@ -9,7 +9,6 @@
     "client_id": "64f78bf1-f388-4eeb-9fee-e7207226c6be-jwt",
     "client_name": "",
     "client_secret_expires_at": 0,
-    "contacts": [],
     "grant_types": [
       "implicit",
       "refresh_token",
@@ -30,8 +29,7 @@
     ],
     "scope": "hydra offline openid",
     "skip_consent": false,
-    "subject_type": "",
-    "tos_uri": ""
+    "subject_type": ""
   },
   "oidc_context": {},
   "requested_access_token_audience": [],
diff --git a/oauth2/.snapshots/TestAuthCodeFlowE2E-auth_code_flow-strategy=opaque-access_and_id_tokens_with_extra_claims_consent_request.json b/oauth2/.snapshots/TestAuthCodeFlowE2E-auth_code_flow-strategy=opaque-access_and_id_tokens_with_extra_claims_consent_request.json
@@ -14,7 +14,6 @@
     "client_id": "64f78bf1-f388-4eeb-9fee-e7207226c6be-opaque",
     "client_name": "",
     "client_secret_expires_at": 0,
-    "contacts": [],
     "grant_types": [
       "implicit",
       "refresh_token",
@@ -35,8 +34,7 @@
     ],
     "scope": "hydra offline openid",
     "skip_consent": false,
-    "subject_type": "",
-    "tos_uri": ""
+    "subject_type": ""
   },
   "oidc_context": {},
   "requested_access_token_audience": [],
diff --git a/oauth2/.snapshots/TestAuthCodeFlowE2E-auth_code_flow-strategy=opaque-access_and_id_tokens_with_extra_claims_login_request.json b/oauth2/.snapshots/TestAuthCodeFlowE2E-auth_code_flow-strategy=opaque-access_and_id_tokens_with_extra_claims_login_request.json
@@ -9,7 +9,6 @@
     "client_id": "64f78bf1-f388-4eeb-9fee-e7207226c6be-opaque",
     "client_name": "",
     "client_secret_expires_at": 0,
-    "contacts": [],
     "grant_types": [
       "implicit",
       "refresh_token",
@@ -30,8 +29,7 @@
     ],
     "scope": "hydra offline openid",
     "skip_consent": false,
-    "subject_type": "",
-    "tos_uri": ""
+    "subject_type": ""
   },
   "oidc_context": {},
   "requested_access_token_audience": [],
diff --git a/oryx/dbal/testhelpers.go b/oryx/dbal/testhelpers.go
@@ -10,12 +10,12 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/ory/x/sqlcon/dockertest"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ory/pop/v6"
 	"github.com/ory/x/fsx"
+	"github.com/ory/x/sqlcon/dockertest"
 )
 
 var hashDumpRegex = regexp.MustCompile(`-- migrations hash: ([^\n]+)\n`)
diff --git a/oryx/hasherx/hasher_bcrypt.go b/oryx/hasherx/hasher_bcrypt.go
@@ -3,13 +3,12 @@ package hasherx
 import (
 	"context"
 
-	"github.com/ory/x/otelx"
 	"github.com/pkg/errors"
-
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-
 	"golang.org/x/crypto/bcrypt"
+
+	"github.com/ory/x/otelx"
 )
 
 // ErrBcryptPasswordLengthReached is returned when the password is longer than 72 bytes.
diff --git a/oryx/hasherx/hasher_pbkdf2.go b/oryx/hasherx/hasher_pbkdf2.go
@@ -11,12 +11,13 @@ import (
 	"fmt"
 	"hash"
 
-	"github.com/ory/x/otelx"
 	"github.com/pkg/errors"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/codes"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/crypto/sha3"
+
+	"github.com/ory/x/otelx"
 )
 
 type (

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,5 @@`
`7`	`7`	`"scope": "",`
`8`	`8`	`"skip_consent": false,`
`9`	`9`	`"subject_type": "",`
`10`		`- "token_endpoint_auth_method": "client_secret_post",`
`11`		`- "tos_uri": ""`
	`10`	`+ "token_endpoint_auth_method": "client_secret_post"`
`12`	`11`	`}`