Skip to content

fix populateResourceFromAnnotation field setting #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ack-prow merged 2 commits into from
Sep 20, 2025
Merged

fix populateResourceFromAnnotation field setting #624

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34ef6b1
fix populateResourceFromAnnotation field setting
michaelhtm Sep 19, 2025
44fe1db
test PopulateResourceAnnotation with opensearchserverless
michaelhtm Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 7 additions & 20 deletions pkg/generate/code/set_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,11 +1383,10 @@ func PopulateResourceFromAnnotation(
memberPath, _ := findFieldInCR(cfg, r, primaryField.Names.Original)
primaryKeyOut += requiredFieldGuardContructor("primaryKey", sourceVarName, primaryField.Names.CamelLower, indentLevel)
targetVarPath := fmt.Sprintf("%s%s", targetVarName, memberPath)
primaryKeyOut += setResourceIdentifierPrimaryIdentifierAnn(cfg, r,
primaryKeyOut += setResourceIdentifierPrimaryIdentifierAnn(
"&primaryKey",
primaryField,
targetVarPath,
sourceVarName,
indentLevel,
)
} else {
Expand Down Expand Up @@ -1458,23 +1457,22 @@ func PopulateResourceFromAnnotation(
panic("primary identifier '" + targetField.Path + "' must be a scalar type since NameOrID is a string")
}

targetVarPath := fmt.Sprintf("%s%s", targetVarName, memberPath)
sourceVarPath := fmt.Sprintf("%s%s", targetVarName, memberPath)
if inputShape.IsRequired(memberName) || isPrimaryIdentifier {
requiredFieldVarName := fmt.Sprintf("f%d", memberIndex)
primaryKeyOut += requiredFieldGuardContructor(requiredFieldVarName, sourceVarName, targetField.Names.CamelLower, indentLevel)
primaryKeyOut += setResourceIdentifierPrimaryIdentifierAnn(cfg, r,
primaryKeyOut += setResourceIdentifierPrimaryIdentifierAnn(
fmt.Sprintf("&%s", requiredFieldVarName),
targetField,
targetVarPath,
sourceVarName,
sourceVarPath,
indentLevel,
)
} else {
additionalKeyOut += setResourceIdentifierAdditionalKeyAnn(
cfg, r,
memberIndex,
targetField,
targetVarPath,
sourceVarPath,
sourceVarName,
names.New(fieldName).CamelLower,
indentLevel,
Expand Down Expand Up @@ -1544,29 +1542,18 @@ func setResourceIdentifierPrimaryIdentifier(
//
// r.ko.Status.BrokerID = &identifier.NameOrID
func setResourceIdentifierPrimaryIdentifierAnn(
cfg *ackgenconfig.Config,
r *model.CRD,
// The variable used for required key
requiredFieldVarName string,
// The field that will be set on the target variable
targetField *model.Field,
// The variable name that we want to set a value to
targetVarName string,
// The struct or struct field that we access our source value from
sourceVarName string,
// Number of levels of indentation to use
indentLevel int,
) string {
qualifiedTargetVar := fmt.Sprintf("%s.%s", targetVarName, targetField.Path)

return setResourceForScalar(
qualifiedTargetVar,
requiredFieldVarName,
targetField.ShapeRef,
indentLevel,
false,
false,
)
indent := strings.Repeat("\t", indentLevel)
return fmt.Sprintf("%s%s = %s\n", indent, qualifiedTargetVar, requiredFieldVarName)
}

// setResourceIdentifierAdditionalKey returns a string of Go code that sets a
Expand Down