Skip to content

Refactor setSDKReadMany and setResourceForScalar #177

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
merged 2 commits into from
Sep 2, 2021
Merged

Refactor setSDKReadMany and setResourceForScalar #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a28e4e7
refactor setSDKReadMany to use FindPluralizedIdentifiersInShape
brycahta Aug 31, 2021
b6ca350
refactor setResourceForScalar with cleaner params
brycahta Aug 31, 2021
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
72 changes: 31 additions & 41 deletions pkg/generate/code/set_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@ func SetResource(
out += fmt.Sprintf(
"%sif %s != nil {\n", indent, sourceAdaptedVarName,
)
qualifiedTargetVar := fmt.Sprintf(
"%s.%s", targetAdaptedVarName, f.Names.Camel,
)

switch sourceMemberShape.Type {
case "list", "structure", "map":
Expand All @@ -279,19 +282,15 @@ func SetResource(
indentLevel+1,
)
out += setResourceForScalar(
cfg, r,
f.Names.Camel,
targetAdaptedVarName,
qualifiedTargetVar,
memberVarName,
sourceMemberShapeRef,
indentLevel+1,
)
}
default:
out += setResourceForScalar(
cfg, r,
f.Names.Camel,
targetAdaptedVarName,
qualifiedTargetVar,
sourceAdaptedVarName,
sourceMemberShapeRef,
indentLevel+1,
Expand Down Expand Up @@ -514,6 +513,11 @@ func setResourceReadMany(
out += fmt.Sprintf(
"%s\tif %s != nil {\n", indent, sourceAdaptedVarName,
)

//ex: r.ko.Spec.CacheClusterID
qualifiedTargetVar := fmt.Sprintf(
"%s.%s", targetAdaptedVarName, f.Names.Camel,
)
switch sourceMemberShape.Type {
case "list", "structure", "map":
{
Expand All @@ -534,9 +538,7 @@ func setResourceReadMany(
indentLevel+2,
)
out += setResourceForScalar(
cfg, r,
f.Names.Camel,
targetAdaptedVarName,
qualifiedTargetVar,
memberVarName,
sourceMemberShapeRef,
indentLevel+2,
Expand Down Expand Up @@ -574,9 +576,7 @@ func setResourceReadMany(
}
// r.ko.Spec.CacheClusterID = elem.CacheClusterId
out += setResourceForScalar(
cfg, r,
f.Names.Camel,
targetAdaptedVarName,
qualifiedTargetVar,
sourceAdaptedVarName,
sourceMemberShapeRef,
indentLevel+2,
Expand Down Expand Up @@ -1008,10 +1008,10 @@ func setResourceIdentifierPrimaryIdentifier(
indentLevel int,
) string {
adaptedMemberPath := fmt.Sprintf("&%s.NameOrID", sourceVarName)
qualifiedTargetVar := fmt.Sprintf("%s.%s", targetVarName, targetField.Path)

return setResourceForScalar(
cfg, r,
targetField.Path,
targetVarName,
qualifiedTargetVar,
adaptedMemberPath,
targetField.ShapeRef,
indentLevel,
Expand Down Expand Up @@ -1052,10 +1052,9 @@ func setResourceIdentifierAdditionalKey(
// throwing an error accessible to the user
additionalKeyOut += fmt.Sprintf("%s%s, %sok := %s\n", indent, fieldIndexName, fieldIndexName, sourceAdaptedVarName)
additionalKeyOut += fmt.Sprintf("%sif %sok {\n", indent, fieldIndexName)
qualifiedTargetVar := fmt.Sprintf("%s.%s", targetVarName, targetField.Path)
additionalKeyOut += setResourceForScalar(
cfg, r,
targetField.Path,
targetVarName,
qualifiedTargetVar,
fmt.Sprintf("&%s", fieldIndexName),
targetField.ShapeRef,
indentLevel+1,
Expand Down Expand Up @@ -1117,9 +1116,7 @@ func setResourceForContainer(
)
default:
return setResourceForScalar(
cfg, r,
targetFieldName,
targetVarName,
fmt.Sprintf("%s.%s", targetFieldName, targetVarName),
sourceVarName,
sourceShapeRef,
indentLevel,
Expand Down Expand Up @@ -1162,6 +1159,9 @@ func SetResourceForStruct(
out += fmt.Sprintf(
"%sif %s != nil {\n", indent, sourceAdaptedVarName,
)
qualifiedTargetVar := fmt.Sprintf(
"%s.%s", targetVarName, cleanNames.Camel,
)
switch memberShape.Type {
case "list", "structure", "map":
{
Expand All @@ -1181,19 +1181,15 @@ func SetResourceForStruct(
indentLevel+1,
)
out += setResourceForScalar(
cfg, r,
cleanNames.Camel,
targetVarName,
qualifiedTargetVar,
memberVarName,
memberShapeRef,
indentLevel+1,
)
}
default:
out += setResourceForScalar(
cfg, r,
cleanNames.Camel,
targetVarName,
qualifiedTargetVar,
sourceAdaptedVarName,
memberShapeRef,
indentLevel+1,
Expand Down Expand Up @@ -1334,30 +1330,24 @@ func setResourceForMap(
// value to a source variable when the type of the source variable is a scalar
// type (not a map, slice or struct).
func setResourceForScalar(
cfg *ackgenconfig.Config,
r *model.CRD,
// The name of the Input SDK Shape member we're outputting for
targetFieldName string,
// The variable name that we want to set a value to
targetVarName string,
// The fully-qualified variable that will be set to sourceVar
targetVar string,
// The struct or struct field that we access our source value from
sourceVarName string,
sourceVar string,
shapeRef *awssdkmodel.ShapeRef,
indentLevel int,
) string {
out := ""
indent := strings.Repeat("\t", indentLevel)
setTo := sourceVarName
setTo := sourceVar
shape := shapeRef.Shape
if shape.Type == "timestamp" {
setTo = "&metav1.Time{*" + sourceVarName + "}"
setTo = "&metav1.Time{*" + sourceVar + "}"
}
targetVarPath := targetVarName
if targetFieldName != "" {
targetVarPath += "." + targetFieldName
} else {
if strings.HasPrefix(targetVar, ".") {
targetVar = targetVar[1:]
setTo = "*" + setTo
}
out += fmt.Sprintf("%s%s = %s\n", indent, targetVarPath, setTo)
out += fmt.Sprintf("%s%s = %s\n", indent, targetVar, setTo)
return out
}
31 changes: 9 additions & 22 deletions pkg/generate/code/set_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ import (
"strings"

awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
"github.com/gertd/go-pluralize"

ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
"github.com/aws-controllers-k8s/code-generator/pkg/model"
"github.com/aws-controllers-k8s/code-generator/pkg/names"
"github.com/aws-controllers-k8s/code-generator/pkg/util"
)

// SetSDK returns the Go code that sets an SDK input shape's member fields from
Expand Down Expand Up @@ -760,9 +758,7 @@ func setSDKReadMany(
indent := strings.Repeat("\t", indentLevel)

resVarPath := ""
pluralize := pluralize.NewClient()
opConfig, override := cfg.OverrideValues(op.Name)
shapeIdentifiers := FindIdentifiersInShape(r, inputShape)
var err error
for memberIndex, memberName := range inputShape.MemberNames() {
if override {
Expand All @@ -787,24 +783,15 @@ func setSDKReadMany(
// Field renames are handled in GetSanitizedMemberPath
resVarPath, err = r.GetSanitizedMemberPath(memberName, op, sourceVarName)
if err != nil {
// if it's an identifier field check for singular/plural
if util.InStrings(memberName, shapeIdentifiers) {
var flipped string
if pluralize.IsPlural(memberName) {
flipped = pluralize.Singular(memberName)
} else {
flipped = pluralize.Plural(memberName)
}
// If there are multiple identifiers, then prioritize the
// 'Id' identifier.
if resVarPath == "" || (!strings.HasSuffix(resVarPath, "Id") ||
!strings.HasSuffix(resVarPath, "Ids")) {
resVarPath, err = r.GetSanitizedMemberPath(flipped, op, sourceVarName)
if err != nil {
panic(fmt.Sprintf(
"Unable to locate identifier field %s in "+
"%s Spec/Status in generate.code.setSDKReadMany", flipped, r.Kind))
}
// if memberName is an identifier field, then check for
// corresponding model identifier
crIdentifier, shapeIdentifier := FindPluralizedIdentifiersInShape(r, inputShape)
if strings.EqualFold(memberName, shapeIdentifier) {
resVarPath, err = r.GetSanitizedMemberPath(crIdentifier, op, sourceVarName)
if err != nil {
panic(fmt.Sprintf(
"Unable to locate identifier field %s in "+
"%s Spec/Status in generate.code.setSDKReadMany", crIdentifier, r.Kind))
}
} else {
// TODO(jaypipes): check generator config for exceptions?
Expand Down