Modified way to ignore S3SHA

aws-controllers-k8s · Sep 28, 2023 · 4b27e88 · 4b27e88
1 parent d9bab7e
commit 4b27e88
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 12 deletions.
diff --git a/pkg/generate/ack/controller.go b/pkg/generate/ack/controller.go
@@ -120,7 +120,7 @@ var (
 			return code.SetSDK(r.Config(), r, ackmodel.OpTypeDelete, sourceVarName, targetVarName, indentLevel)
 		},
 		"GoCodeSetSDKForStruct": func(r *ackmodel.CRD, targetFieldName string, targetVarName string, targetShapeRef *awssdkmodel.ShapeRef, sourceFieldPath string, sourceVarName string, indentLevel int) string {
-			return code.SetSDKForStruct(r.Config(), r, targetFieldName, targetVarName, targetShapeRef, sourceFieldPath, sourceVarName, indentLevel)
+			return code.SetSDKForStruct(r.Config(), r, targetFieldName, targetVarName, targetShapeRef, sourceFieldPath, sourceVarName, model.OpTypeList, indentLevel)
 		},
 		"GoCodeSetResourceForStruct": func(r *ackmodel.CRD, targetFieldName string, targetVarName string, targetShapeRef *awssdkmodel.ShapeRef, sourceVarName string, sourceShapeRef *awssdkmodel.ShapeRef, indentLevel int) string {
 			var setCfg *ackgenconfig.SetFieldConfig = nil

diff --git a/pkg/generate/code/set_sdk.go b/pkg/generate/code/set_sdk.go
@@ -255,6 +255,11 @@ func SetSDK(
 			continue
 		}
 
+		// setCfg := f.GetSetterConfig(opType)
+		// if setCfg != nil && setCfg.Ignore {
+		// 	continue
+		// }
+
 		sourceAdaptedVarName += "." + f.Names.Camel
 		sourceFieldPath := f.Names.Camel
 
@@ -349,6 +354,7 @@ func SetSDK(
 					sourceFieldPath,
 					sourceAdaptedVarName,
 					memberShapeRef,
+					opType,
 					indentLevel+1,
 				)
 				out += setSDKForScalar(
@@ -932,6 +938,7 @@ func setSDKForContainer(
 	sourceVarName string,
 	// ShapeRef of the target struct field
 	targetShapeRef *awssdkmodel.ShapeRef,
+	op model.OpType,
 	indentLevel int,
 ) string {
 	switch targetShapeRef.Shape.Type {
@@ -943,6 +950,7 @@ func setSDKForContainer(
 			targetShapeRef,
 			sourceFieldPath,
 			sourceVarName,
+			op,
 			indentLevel,
 		)
 	case "list":
@@ -953,6 +961,7 @@ func setSDKForContainer(
 			targetShapeRef,
 			sourceFieldPath,
 			sourceVarName,
+			op,
 			indentLevel,
 		)
 	case "map":
@@ -963,6 +972,7 @@ func setSDKForContainer(
 			targetShapeRef,
 			sourceFieldPath,
 			sourceVarName,
+			op,
 			indentLevel,
 		)
 	default:
@@ -1086,6 +1096,7 @@ func SetSDKForStruct(
 	sourceFieldPath string,
 	// The struct or struct field that we access our source value from
 	sourceVarName string,
+	op model.OpType,
 	indentLevel int,
 ) string {
 	out := ""
@@ -1105,22 +1116,35 @@ func SetSDKForStruct(
 
 		// To check if the field member has `ignore` set to `true`.
 		// This condition currently applies only for members of a field whose shape is `structure`
-		if r.Fields[targetFieldName] != nil {
-			memberField := r.Fields[targetFieldName].MemberFields[memberName]
-			if memberField != nil && memberField.FieldConfig != nil && memberField.FieldConfig.Set != nil {
-				set := memberField.FieldConfig.Set
-				shouldIgnore := false
-				for _, value := range set {
-					if value.Ignore == true {
-						shouldIgnore = true
-					}
-				}
-				if shouldIgnore {
+		var setCfg *ackgenconfig.SetFieldConfig
+		f, ok := r.Fields[targetFieldName]
+		if ok {
+			mf, ok := f.MemberFields[memberName]
+			if ok {
+				setCfg = mf.GetSetterConfig(op)
+				if setCfg != nil && setCfg.Ignore {
 					continue
 				}
 			}
+
 		}
 
+		// if r.Fields[targetFieldName] != nil {
+		// 	memberField := r.Fields[targetFieldName].MemberFields[memberName]
+		// 	if memberField != nil && memberField.FieldConfig != nil && memberField.FieldConfig.Set != nil {
+		// 		set := memberField.FieldConfig.Set
+		// 		shouldIgnore := false
+		// 		for _, value := range set {
+		// 			if value.Ignore == true {
+		// 				shouldIgnore = true
+		// 			}
+		// 		}
+		// 		if shouldIgnore {
+		// 			continue
+		// 		}
+		// 	}
+		// }
+
 		out += fmt.Sprintf(
 			"%sif %s != nil {\n", indent, sourceAdaptedVarName,
 		)
@@ -1144,6 +1168,7 @@ func SetSDKForStruct(
 					memberFieldPath,
 					sourceAdaptedVarName,
 					memberShapeRef,
+					op,
 					indentLevel+1,
 				)
 				out += setSDKForScalar(
@@ -1201,6 +1226,7 @@ func setSDKForSlice(
 	sourceFieldPath string,
 	// The struct or struct field that we access our source value from
 	sourceVarName string,
+	op model.OpType,
 	indentLevel int,
 ) string {
 	out := ""
@@ -1234,6 +1260,7 @@ func setSDKForSlice(
 		sourceFieldPath,
 		iterVarName,
 		&targetShape.MemberRef,
+		op,
 		indentLevel+1,
 	)
 	addressOfVar := ""
@@ -1264,6 +1291,7 @@ func setSDKForMap(
 	sourceFieldPath string,
 	// The struct or struct field that we access our source value from
 	sourceVarName string,
+	op model.OpType,
 	indentLevel int,
 ) string {
 	out := ""
@@ -1298,6 +1326,7 @@ func setSDKForMap(
 		sourceFieldPath,
 		valIterVarName,
 		&targetShape.ValueRef,
+		op,
 		indentLevel+1,
 	)
 	addressOfVar := ""

diff --git a/pkg/model/field.go b/pkg/model/field.go
@@ -196,6 +196,15 @@ func (f *Field) GetSetterConfig(opType OpType) *ackgenconfig.SetFieldConfig {
 	}
 	rmMethod := ResourceManagerMethodFromOpType(opType)
 	for _, setCfg := range f.FieldConfig.Set {
+		if setCfg == nil {
+			continue
+		}
+		if setCfg.Ignore == true {
+			return setCfg
+		}
+		if setCfg.Ignore == true || setCfg.To == nil {
+			continue
+		}
 		// If the Method attribute is nil, that means the setter config applies to
 		// all resource manager methods for this field.
 		if setCfg.Method == nil || strings.EqualFold(rmMethod, *setCfg.Method) {