feat: show canonical id in user status (#153)

statnett · Feb 20, 2025 · fa81bde · fa81bde
1 parent 4cb8806
commit fa81bde
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/apis/user/v1alpha1/user_types.go b/apis/user/v1alpha1/user_types.go
@@ -44,6 +44,7 @@ type UserParameters struct {
 
 // UserObservation are the observable fields of a User.
 type UserObservation struct {
+	CanonicalID string `json:"canonicalId,omitempty"`
 }
 
 // A UserSpec defines the desired state of a User.

diff --git a/internal/controller/user/user.go b/internal/controller/user/user.go
@@ -157,7 +157,7 @@ func (c *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
 		return managed.ExternalObservation{}, nil
 	}
 
-	_, err := c.cloudianService.GetUser(ctx, cloudian.GroupUserID{
+	user, err := c.cloudianService.GetUser(ctx, cloudian.GroupUserID{
 		GroupID: group,
 		UserID:  externalName})
 	if errors.Is(err, cloudian.ErrNotFound) {
@@ -167,6 +167,7 @@ func (c *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
 		return managed.ExternalObservation{}, errors.Wrap(err, errGetUser)
 	}
 
+	cr.Status.AtProvider.CanonicalID = user.CanonicalID
 	cr.SetConditions(xpv1.Available())
 
 	return managed.ExternalObservation{

diff --git a/internal/sdk/cloudian/sdk.go b/internal/sdk/cloudian/sdk.go
@@ -103,6 +103,7 @@ type GroupUserID struct {
 type User struct {
 	GroupUserID `json:",inline"`
 	UserType    UserType `json:"userType"`
+	CanonicalID string   `json:"canonicalUserId,omitempty"`
 }
 
 // SecurityInfo is the Cloudian API's term for secure credentials

diff --git a/internal/sdk/cloudian/sdk_test.go b/internal/sdk/cloudian/sdk_test.go
@@ -162,8 +162,8 @@ func TestClient_GetUser(t *testing.T) {
 		status  int
 		wantErr error
 	}{
-		{name: "Exists", user: User{GroupUserID: GroupUserID{UserID: strconv.Itoa(http.StatusOK)}}},
-		{name: "Not found", user: User{GroupUserID: GroupUserID{UserID: strconv.Itoa(http.StatusNoContent)}}, wantErr: ErrNotFound},
+		{name: "Exists", user: User{GroupUserID: GroupUserID{UserID: strconv.Itoa(http.StatusOK)}, CanonicalID: "123"}},
+		{name: "Not found", user: User{GroupUserID: GroupUserID{UserID: strconv.Itoa(http.StatusNoContent)}, CanonicalID: "123"}, wantErr: ErrNotFound},
 	}
 
 	client, testServer := mockBy(func(w http.ResponseWriter, r *http.Request) {

diff --git a/package/crds/user.cloudian.crossplane.io_users.yaml b/package/crds/user.cloudian.crossplane.io_users.yaml
@@ -325,6 +325,9 @@ spec:
             properties:
               atProvider:
                 description: UserObservation are the observable fields of a User.
+                properties:
+                  canonicalId:
+                    type: string
                 type: object
               conditions:
                 description: Conditions of the resource.