feat: add AccountInfo subroutine and related configurations

openmfp · Feb 25, 2025 · 7d491e5 · 7d491e5
1 parent f1af48a
commit 7d491e5
Show file tree

Hide file tree

Showing 19 changed files with 698 additions and 1,113 deletions.
diff --git a/.testcoverage.yml b/.testcoverage.yml
@@ -4,3 +4,4 @@ exclude:
     - api/v1alpha1 # skipping generated files and crd type definitions
     - main\.go$ # skip covering main.go
     - ^cmd # skip covering cmd directory
+    - ^pkg/testing/kcpenvtest # skip covering kcpenvtest
diff --git a/api/v1alpha1/account_info_types.go b/api/v1alpha1/account_info_types.go
@@ -24,14 +24,20 @@ import (
 type AccountInfoSpec struct {
 	FGA           FGAInfo          `json:"fga"`
 	Account       AccountLocation  `json:"account"`
-	ParentAccount *AccountLocation `json:"parentAccount"`
+	ParentAccount *AccountLocation `json:"parentAccount,omitempty"`
 	Organization  AccountLocation  `json:"organization"`
+	ClusterInfo   ClusterInfo      `json:"clusterInfo"`
+}
+
+type ClusterInfo struct {
+	CA string `json:"ca"`
 }
 
 type AccountLocation struct {
 	Name      string      `json:"name"`
 	ClusterId string      `json:"clusterId"`
 	Path      string      `json:"path"`
+	URL       string      `json:"url"`
 	Type      AccountType `json:"type"`
 }
 
@@ -48,9 +54,9 @@ type AccountInfoStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=accountinfos
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
-// +kubebuilder:resource:path=accountinfos
 // Account is the Schema for the accounts API
 type AccountInfo struct {
 	metav1.TypeMeta   `json:",inline"`
@@ -62,13 +68,13 @@ type AccountInfo struct {
 
 //+kubebuilder:object:root=true
 
-// AccountLocationList contains a list of Account
-type AccountLocationList struct {
+// AccountInfoList contains a list of Account
+type AccountInfoList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Account `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&AccountInfo{}, &AccountLocationList{})
+	SchemeBuilder.Register(&AccountInfo{}, &AccountInfoList{})
 }
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/...ig/crd/core.openmfp.org_AccountInfos.yaml → ...ig/crd/core.openmfp.org_accountinfos.yaml b/...ig/crd/core.openmfp.org_AccountInfos.yaml → ...ig/crd/core.openmfp.org_accountinfos.yaml
@@ -12,7 +12,7 @@ spec:
     listKind: AccountInfoList
     plural: accountinfos
     singular: accountinfo
-  scope: Namespaced
+  scope: Cluster
   versions:
   - name: v1alpha1
     schema:
@@ -49,11 +49,21 @@ spec:
                     type: string
                   type:
                     type: string
+                  url:
+                    type: string
                 required:
                 - clusterId
                 - name
                 - path
                 - type
+                - url
+                type: object
+              clusterInfo:
+                properties:
+                  ca:
+                    type: string
+                required:
+                - ca
                 type: object
               fga:
                 properties:
@@ -77,11 +87,14 @@ spec:
                     type: string
                   type:
                     type: string
+                  url:
+                    type: string
                 required:
                 - clusterId
                 - name
                 - path
                 - type
+                - url
                 type: object
               parentAccount:
                 properties:
@@ -93,17 +106,20 @@ spec:
                     type: string
                   type:
                     type: string
+                  url:
+                    type: string
                 required:
                 - clusterId
                 - name
                 - path
                 - type
+                - url
                 type: object
             required:
             - account
+            - clusterInfo
             - fga
             - organization
-            - parentAccount
             type: object
           status:
             description: AccountInfoStatus defines the observed state of Account

diff --git a/config/resources/apiexport-core.openmfp.org.yaml b/config/resources/apiexport-core.openmfp.org.yaml
@@ -6,5 +6,5 @@ metadata:
 spec:
   latestResourceSchemas:
   - v250220-cdcd05c.accounts.core.openmfp.org
-  - v250224-cafdd19.accountinfos.core.openmfp.org
+  - v250225-f1af48a.accountinfos.core.openmfp.org
 status: {}
diff --git a/config/resources/apiresourceschema-AccountInfos.core.openmfp.org.yaml b/config/resources/apiresourceschema-AccountInfos.core.openmfp.org.yaml
@@ -2,15 +2,15 @@ apiVersion: apis.kcp.io/v1alpha1
 kind: APIResourceSchema
 metadata:
   creationTimestamp: null
-  name: v250224-cafdd19.accountinfos.core.openmfp.org
+  name: v250225-f1af48a.accountinfos.core.openmfp.org
 spec:
   group: core.openmfp.org
   names:
     kind: AccountInfo
     listKind: AccountInfoList
     plural: accountinfos
     singular: accountinfo
-  scope: Namespaced
+  scope: Cluster
   versions:
   - name: v1alpha1
     schema:
@@ -46,11 +46,21 @@ spec:
                   type: string
                 type:
                   type: string
+                url:
+                  type: string
               required:
               - clusterId
               - name
               - path
               - type
+              - url
+              type: object
+            clusterInfo:
+              properties:
+                ca:
+                  type: string
+              required:
+              - ca
               type: object
             fga:
               properties:
@@ -74,11 +84,14 @@ spec:
                   type: string
                 type:
                   type: string
+                url:
+                  type: string
               required:
               - clusterId
               - name
               - path
               - type
+              - url
               type: object
             parentAccount:
               properties:
@@ -90,17 +103,20 @@ spec:
                   type: string
                 type:
                   type: string
+                url:
+                  type: string
               required:
               - clusterId
               - name
               - path
               - type
+              - url
               type: object
           required:
           - account
+          - clusterInfo
           - fga
           - organization
-          - parentAccount
           type: object
         status:
           description: AccountInfoStatus defines the observed state of Account

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -33,6 +33,9 @@ type Config struct {
 		Workspace struct {
 			Enabled bool `envconfig:"default=true"`
 		}
+		AccountInfo struct {
+			Enabled bool `envconfig:"default=true"`
+		}
 		FGA struct {
 			Enabled         bool   `envconfig:"default=true"`
 			RootNamespace   string `envconfig:"default=openmfp-root"`

diff --git a/internal/controller/account_controller.go b/internal/controller/account_controller.go
@@ -31,7 +31,6 @@ import (
 
 	corev1alpha1 "github.com/openmfp/account-operator/api/v1alpha1"
 	"github.com/openmfp/account-operator/internal/config"
-	"github.com/openmfp/account-operator/pkg/service"
 	"github.com/openmfp/account-operator/pkg/subroutines"
 )
 
@@ -50,6 +49,10 @@ func NewAccountReconciler(log *logger.Logger, mgr ctrl.Manager, cfg config.Confi
 	if cfg.Subroutines.Workspace.Enabled {
 		subs = append(subs, subroutines.NewWorkspaceSubroutine(mgr.GetClient()))
 	}
+	if cfg.Subroutines.AccountInfo.Enabled {
+		subs = append(subs, subroutines.NewAccountInfoSubroutine(mgr.GetClient(), mgr.GetConfig().CAFile))
+	}
+	// The extensions subroutine is temporarily disabled in this release. It will be refactored and activated in a later release
 	//if cfg.Subroutines.Extension.Enabled {
 	//	subs = append(subs, subroutines.NewExtensionSubroutine(mgr.GetClient()))
 	//}
@@ -68,11 +71,8 @@ func NewAccountReconciler(log *logger.Logger, mgr ctrl.Manager, cfg config.Confi
 		}
 		log.Debug().Msg("FGA client created")
 
-		srv := service.NewService(mgr.GetClient(), cfg.Subroutines.FGA.RootNamespace)
-
 		fgaClient := openfgav1.NewOpenFGAServiceClient(conn)
-
-		subs = append(subs, subroutines.NewFGASubroutine(mgr.GetClient(), fgaClient, srv, cfg.Subroutines.FGA.RootNamespace, cfg.Subroutines.FGA.CreatorRelation, cfg.Subroutines.FGA.ParentRelation, cfg.Subroutines.FGA.ObjectType))
+		subs = append(subs, subroutines.NewFGASubroutine(mgr.GetClient(), fgaClient, cfg.Subroutines.FGA.CreatorRelation, cfg.Subroutines.FGA.ParentRelation, cfg.Subroutines.FGA.ObjectType))
 	}
 	return &AccountReconciler{
 		lifecycle: lifecycle.NewLifecycleManager(log, operatorName, accountReconcilerName, mgr.GetClient(), subs).WithSpreadingReconciles().WithConditionManagement(),