Lint new files from the GitHub branch

test/integration/e2e_test.go

@@ -399,7 +399,7 @@ func TestE2EFullIntegration_Browser(t *testing.T) {
 		_, err = ptyFile.WriteString(authCode + "\n")
 		require.NoError(t, err)
 
-		// Read all of the remaining output from the subprocess until EOF.
+		// Read all the remaining output from the subprocess until EOF.
 		t.Logf("waiting for kubectl to output namespace list")
 		// Read all output from the subprocess until EOF.
 		// Ignore any errors returned because there is always an error on linux.
@@ -487,7 +487,7 @@ func TestE2EFullIntegration_Browser(t *testing.T) {
 		kubectlCmd.Env = slices.Concat(os.Environ(), env.ProxyEnv())
 		var kubectlStdoutPipe io.ReadCloser
 		if runtime.GOOS != "darwin" {
-			// For some unknown reason this breaks the pty library on some MacOS machines.
+			// For some unknown reason this breaks the pty library on some macOS machines.
 			// The problem doesn't reproduce for everyone, so this is just a workaround.
 			kubectlStdoutPipe, err = kubectlCmd.StdoutPipe()
 			require.NoError(t, err)
@@ -529,7 +529,7 @@ func TestE2EFullIntegration_Browser(t *testing.T) {
 		_, err = ptyFile.WriteString(authCode + "\n")
 		require.NoError(t, err)
 
-		// Read all of the remaining output from the subprocess until EOF.
+		// Read all the remaining output from the subprocess until EOF.
 		t.Logf("waiting for kubectl to output namespace list")
 		// Read all output from the subprocess until EOF.
 		// Ignore any errors returned because there is always an error on linux.
@@ -539,10 +539,10 @@ func TestE2EFullIntegration_Browser(t *testing.T) {
 			kubectlStdOutOutputBytes, _ := io.ReadAll(kubectlStdoutPipe)
 			requireKubectlGetNamespaceOutput(t, env, string(kubectlStdOutOutputBytes))
 		} else {
-			// On MacOS check that the pty (stdout+stderr+stdin) of the CLI contains the expected output.
+			// On macOS check that the pty (stdout+stderr+stdin) of the CLI contains the expected output.
 			requireKubectlGetNamespaceOutput(t, env, string(kubectlPtyOutputBytes))
 		}
-		// Due to the GOOS check in the code above, on MacOS the pty will include stdout, and other platforms it will not.
+		// Due to the GOOS check in the code above, on macOS the pty will include stdout, and other platforms it will not.
 		// This warning message is supposed to be printed by the CLI on stderr.
 		require.Contains(t, string(kubectlPtyOutputBytes),
 			"Access token from identity provider has lifetime of less than 3 hours. Expect frequent prompts to log in.")
@@ -1253,8 +1253,8 @@ func TestE2EFullIntegration_Browser(t *testing.T) {
 				).Name,
 			},
 		}, idpv1alpha1.GitHubPhaseReady)
-		testlib.WaitForFederationDomainStatusPhase(testCtx, t, federationDomain.Name, configv1alpha1.FederationDomainPhaseReady)
-		testlib.WaitForJWTAuthenticatorStatusPhase(testCtx, t, authenticator.Name, authv1alpha.JWTAuthenticatorPhaseReady)
+		testlib.WaitForFederationDomainStatusPhase(testCtx, t, federationDomain.Name, supervisorconfigv1alpha1.FederationDomainPhaseReady)
+		testlib.WaitForJWTAuthenticatorStatusPhase(testCtx, t, authenticator.Name, authenticationv1alpha1.JWTAuthenticatorPhaseReady)
 
 		// Use a specific session cache for this test.
 		sessionCachePath := tempDir + "/test-sessions.yaml"
@@ -1582,7 +1582,7 @@ func TestE2EFullIntegration_Browser(t *testing.T) {
 		)
 		require.NoError(t, err)
 
-		// Wait for the status conditions to have observed the current spec generation so we can be sure that the
+		// Wait for the status conditions to have observed the current spec generation, so we can be sure that the
 		// controller has observed our latest update.
 		testlib.RequireEventually(t, func(requireEventually *require.Assertions) {
 			fd, err := federationDomainsClient.Get(testCtx, federationDomain.Name, metav1.GetOptions{})

test/integration/supervisor_login_test.go

@@ -76,7 +76,7 @@ type supervisorLoginTestcase struct {
 	// Optionally specify the identityProviders part of the FederationDomain's spec by returning it from this function.
 	// Also return the displayName of the IDP that should be used during authentication (or empty string for no IDP name in the auth request).
 	// This function takes the name of the IDP CR which was returned by createIDP() as as argument.
-	federationDomainIDPs func(t *testing.T, idpName string) (idps []configv1alpha1.FederationDomainIdentityProvider, useIDPDisplayName string)
+	federationDomainIDPs func(t *testing.T, idpName string) (idps []supervisorconfigv1alpha1.FederationDomainIdentityProvider, useIDPDisplayName string)
 
 	// Optionally create an OIDCClient CR for the test to use. Return the client ID and client secret for the
 	// test to use. When not set, the test will default to using the "pinniped-cli" static client with no secret.
@@ -119,7 +119,7 @@ type supervisorLoginTestcase struct {
 	wantDownstreamIDTokenGroups []string
 	// The expected ID token additional claims, which will be nested under claim "additionalClaims",
 	// for the original ID token and the refreshed ID token.
-	wantDownstreamIDTokenAdditionalClaims map[string]interface{}
+	wantDownstreamIDTokenAdditionalClaims map[string]any
 	// The expected ID token lifetime, as calculated by token claim 'exp' subtracting token claim 'iat'.
 	// ID tokens issued through authcode exchange or token refresh should have the configured lifetime (or default if not configured).
 	// ID tokens issued through a token exchange should have the default lifetime.
@@ -814,7 +814,7 @@ func TestSupervisorLogin_Browser(t *testing.T) {
 				requestAuthorizationUsingCLIPasswordFlow(t,
 					downstreamAuthorizeURL,
 					env.SupervisorUpstreamLDAP.TestUserMailAttributeValue, // username to present to server during login
-					"incorrect",                                           // password to present to server during login
+					"incorrect", // password to present to server during login
 					httpClient,
 					true,
 				)
@@ -2358,9 +2358,9 @@ func supervisorLoginGithubTestcases(
 				}
 				return testlib.CreateTestGitHubIdentityProvider(t, spec, idpv1alpha1.GitHubPhaseReady).Name
 			},
-			federationDomainIDPs: func(t *testing.T, idpName string) ([]configv1alpha1.FederationDomainIdentityProvider, string) {
+			federationDomainIDPs: func(t *testing.T, idpName string) ([]supervisorconfigv1alpha1.FederationDomainIdentityProvider, string) {
 				displayName := "some-github-identity-provider-name"
-				return []configv1alpha1.FederationDomainIdentityProvider{
+				return []supervisorconfigv1alpha1.FederationDomainIdentityProvider{
 						{
 							DisplayName: displayName,
 							ObjectRef: corev1.TypedLocalObjectReference{
@@ -2392,7 +2392,7 @@ func supervisorLoginGithubTestcases(
 	}
 }
 
-func wantGroupsInAdditionalClaimsIfGroupsExist(additionalClaims map[string]interface{}, wantGroupsAdditionalClaimName string, wantGroups []string) map[string]interface{} {
+func wantGroupsInAdditionalClaimsIfGroupsExist(additionalClaims map[string]any, wantGroupsAdditionalClaimName string, wantGroups []string) map[string]any {
 	if len(wantGroups) > 0 {
 		var wantGroupsAnyType []any
 		for _, group := range wantGroups {

test/testlib/client.go

@@ -620,7 +620,7 @@ func CreateTestGitHubIdentityProviderWithObjectMeta(t *testing.T, spec idpv1alph
 	t.Cleanup(func() {
 		t.Logf("cleaning up test GitHubIdentityProvider %s/%s", created.Namespace, created.Name)
 		err := upstreams.Delete(context.Background(), created.Name, metav1.DeleteOptions{})
-		notFound := k8serrors.IsNotFound(err)
+		notFound := apierrors.IsNotFound(err)
 		// It's okay if it is not found, because it might have been deleted by another part of this test.
 		if !notFound {
 			require.NoErrorf(t, err, "could not cleanup test GitHubIdentityProvider %s/%s", created.Namespace, created.Name)