Update syntheric user format

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

internal/operator-controller/action/restconfig.go

@@ -14,7 +14,7 @@ import (
 	"github.com/operator-framework/operator-controller/internal/operator-controller/features"
 )
 
-const syntheticServiceAccountName = "olmv1:synthetic"
+const syntheticServiceAccountName = "olm:synthetic-user"
 
 type clusterExtensionRestConfigMapper struct {
 	saRestConfigMapper        func(ctx context.Context, o client.Object, c *rest.Config) (*rest.Config, error)

internal/operator-controller/action/restconfig_test.go

@@ -44,13 +44,13 @@ func TestMapper_SyntheticPermissionsEnabled(t *testing.T) {
 		fgEnabled          bool
 	}{
 		{
-			description:        "user service account wrapper if extension service account is _not_ called olmv1:synthetic",
-			serviceAccountName: "_not_:olmv1:synthetic",
+			description:        "user service account wrapper if extension service account is _not_ called olm:synthetic-user",
+			serviceAccountName: "_not_:olm:synthetic-user",
 			expectedMapper:     saAccountWrapper,
 			fgEnabled:          true,
 		}, {
-			description:        "user synthetic user wrapper is extension service account is called olmv1:synthetic",
-			serviceAccountName: "olmv1:synthetic",
+			description:        "user synthetic user wrapper is extension service account is called olm:synthetic-user",
+			serviceAccountName: "olm:synthetic-user",
 			expectedMapper:     synthUserWrapper,
 			fgEnabled:          true,
 		},
@@ -80,7 +80,7 @@ func TestMapper_SyntheticPermissionsDisabled(t *testing.T) {
 	ext := &ocv1.ClusterExtension{
 		Spec: ocv1.ClusterExtensionSpec{
 			ServiceAccount: ocv1.ServiceAccountReference{
-				Name: "olmv1:synthetic",
+				Name: "olm:synthetic-user",
 			},
 		},
 	}

internal/operator-controller/authentication/synthetic.go

@@ -9,12 +9,12 @@ import (
 )
 
 func SyntheticUserName(ext ocv1.ClusterExtension) string {
-	return fmt.Sprintf("olmv1:clusterextensions:%s:admin", ext.Name)
+	return fmt.Sprintf("olm:clusterextensions:%s", ext.Name)
 }
 
 func SyntheticGroups(_ ocv1.ClusterExtension) []string {
 	return []string{
-		"olmv1:clusterextensions:admin",
+		"olmv1:clusterextensions",
 		"system:authenticated",
 	}
 }

internal/operator-controller/authentication/synthetic_test.go

@@ -16,13 +16,13 @@ func TestSyntheticUserName(t *testing.T) {
 			Name: "my-ext",
 		},
 	})
-	require.Equal(t, "olmv1:clusterextensions:my-ext:admin", syntheticUserName)
+	require.Equal(t, "olm:clusterextensions:my-ext", syntheticUserName)
 }
 
 func TestSyntheticGroups(t *testing.T) {
 	syntheticGroups := authentication.SyntheticGroups(ocv1.ClusterExtension{})
 	require.Equal(t, []string{
-		"olmv1:clusterextensions:admin",
+		"olmv1:clusterextensions",
 		"system:authenticated",
 	}, syntheticGroups)
 }
@@ -33,9 +33,9 @@ func TestSyntheticImpersonationConfig(t *testing.T) {
 			Name: "my-ext",
 		},
 	})
-	require.Equal(t, "olmv1:clusterextensions:my-ext:admin", config.UserName)
+	require.Equal(t, "olm:clusterextensions:my-ext", config.UserName)
 	require.Equal(t, []string{
-		"olmv1:clusterextensions:admin",
+		"olmv1:clusterextensions",
 		"system:authenticated",
 	}, config.Groups)
 	require.Empty(t, config.UID)