Fix potential use of wrong statements (#3168)

Azure · Jul 28, 2023 · 11f4803 · 11f4803
1 parent 7b29f8b
commit 11f4803
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/v2/tools/generator/internal/armconversion/convert_from_arm_function_builder.go b/v2/tools/generator/internal/armconversion/convert_from_arm_function_builder.go
@@ -65,6 +65,7 @@ func newConvertFromARMFunctionBuilder(
 	result.typeConversionBuilder.AddConversionHandlers(result.convertComplexTypeNameProperty)
 	result.propertyConversionHandlers = []propertyConversionHandler{
 		// Handlers for specific properties come first
+		skipPropertiesFlaggedWithNoARMConversion,
 		result.namePropertyHandler,
 		result.ownerPropertyHandler,
 		result.conditionsPropertyHandler,

diff --git a/v2/tools/generator/internal/armconversion/convert_to_arm_function_builder.go b/v2/tools/generator/internal/armconversion/convert_to_arm_function_builder.go
@@ -67,6 +67,7 @@ func newConvertToARMFunctionBuilder(
 
 	result.propertyConversionHandlers = []propertyConversionHandler{
 		// Handlers for specific properties come first
+		skipPropertiesFlaggedWithNoARMConversion,
 		result.namePropertyHandler,
 		result.operatorSpecPropertyHandler,
 		result.configMapReferencePropertyHandler,

diff --git a/v2/tools/generator/internal/armconversion/shared.go b/v2/tools/generator/internal/armconversion/shared.go
@@ -41,11 +41,6 @@ const (
 	TypeKindStatus
 )
 
-const (
-	ConversionTag        = "conversion"
-	NoARMConversionValue = "noarmconversion"
-)
-
 func (builder conversionBuilder) propertyConversionHandler(
 	toProp *astmodel.PropertyDefinition,
 	fromType *astmodel.ObjectType,
@@ -58,7 +53,7 @@ func (builder conversionBuilder) propertyConversionHandler(
 			break
 		}
 
-		if conversion.matched || toProp.HasTagValue(ConversionTag, NoARMConversionValue) {
+		if conversion.matched {
 			return conversion.statements, nil
 		}
 	}
@@ -241,3 +236,20 @@ func removeEmptyStatements(stmts []dst.Stmt) []dst.Stmt {
 
 	return result
 }
+
+const (
+	ConversionTag        = "conversion"
+	NoARMConversionValue = "noarmconversion"
+)
+
+func skipPropertiesFlaggedWithNoARMConversion(
+	toProp *astmodel.PropertyDefinition,
+	fromType *astmodel.ObjectType,
+) (propertyConversionHandlerResult, error) {
+	// If the property has been flagged as not being convertible, skip it
+	if toProp.HasTagValue(ConversionTag, NoARMConversionValue) {
+		return handledWithNoOp, nil
+	}
+
+	return notHandled, nil
+}