refactor: CanonicalID

statnett · Feb 20, 2025 · b303d6f · b303d6f
1 parent 88cbef5
commit b303d6f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/internal/controller/user/user.go b/internal/controller/user/user.go
@@ -167,7 +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.CanonicalUserID
+	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
@@ -101,9 +101,9 @@ type GroupUserID struct {
 }
 
 type User struct {
-	GroupUserID     `json:",inline"`
-	UserType        UserType `json:"userType"`
-	CanonicalUserID string   `json:"canonicalUserId,omitempty"`
+	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)}, CanonicalUserID: "123"}},
-		{name: "Not found", user: User{GroupUserID: GroupUserID{UserID: strconv.Itoa(http.StatusNoContent)}, CanonicalUserID: "123"}, 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) {