fix: pipeline fixes

[skip ci]
This commit is contained in:
Marcel S. Henselin 2026-03-10 17:15:51 +01:00
parent eecf98f4b1
commit 8c490da5ce
6 changed files with 56 additions and 47 deletions

View file

@ -80,18 +80,18 @@ func mapFields(userResp *v3alpha1api.GetUserResponse, model *resourceModel, regi
user := userResp
// Handle user ID
var userId int64
var userID int64
if model.UserId.ValueInt64() != 0 {
userId = model.UserId.ValueInt64()
userID = model.UserId.ValueInt64()
} else if user.Id != 0 {
userId = user.Id
userID = user.Id
} else {
return fmt.Errorf("user id not present")
}
// Set main attributes
model.Id = types.Int64Value(userId)
model.UserId = types.Int64Value(userId)
model.Id = types.Int64Value(userID)
model.UserId = types.Int64Value(userID)
model.Username = types.StringValue(user.Username)
// Map roles
@ -135,9 +135,9 @@ func mapFieldsCreate(userResp *v3alpha1api.CreateUserResponse, model *resourceMo
if user.Id == 0 {
return fmt.Errorf("user id not present")
}
userId := user.Id
model.Id = types.Int64Value(userId)
model.UserId = types.Int64Value(userId)
userID := user.Id
model.Id = types.Int64Value(userID)
model.UserId = types.Int64Value(userID)
model.Username = types.StringValue(user.Username)
if user.Password == "" {
@ -185,9 +185,13 @@ func toCreatePayload(
return nil, fmt.Errorf("nil model")
}
return &v3alpha1api.CreateUserRequestPayload{
res := v3alpha1api.CreateUserRequestPayload{
Username: model.Username.ValueString(),
DefaultDatabase: model.DefaultDatabase.ValueStringPointer(),
DefaultDatabase: nil,
Roles: roles,
}, nil
}
if !model.DefaultDatabase.IsUnknown() && !model.DefaultDatabase.IsNull() {
res.DefaultDatabase = model.DefaultDatabase.ValueStringPointer()
}
return &res, nil
}