export FieldType function so it can be used outside cloud package

GoogleCloudPlatform · Jul 15, 2024 · 87c036e · 87c036e
1 parent d51d811
commit 87c036e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/pkg/cloud/api/check.go b/pkg/cloud/api/check.go
@@ -39,7 +39,7 @@ func checkPostAccess(traits *FieldTraits, v reflect.Value) error {
 			if ft.Name == "NullFields" || ft.Name == "ForceSendFields" {
 				continue
 			}
-			fType := traits.fieldType(p.Field(ft.Name))
+			fType := traits.FieldType(p.Field(ft.Name))
 			fv := v.Field(i)
 			fp := p.Field(ft.Name)
 

diff --git a/pkg/cloud/api/diff.go b/pkg/cloud/api/diff.go
@@ -156,7 +156,7 @@ func (d *differ[T]) do(p Path, av, bv reflect.Value) error {
 			}
 
 			fp := p.Field(aft.Name)
-			switch d.traits.fieldType(fp) {
+			switch d.traits.FieldType(fp) {
 			case FieldTypeOutputOnly, FieldTypeSystem:
 				continue
 			}

diff --git a/pkg/cloud/api/fill.go b/pkg/cloud/api/fill.go
@@ -176,7 +176,7 @@ func fillNullAndForceSend(traits *FieldTraits, v reflect.Value) error {
 			if ft.Name == "NullFields" || ft.Name == "ForceSendFields" {
 				continue
 			}
-			fType := traits.fieldType(p.Field(ft.Name))
+			fType := traits.FieldType(p.Field(ft.Name))
 			fv := v.Field(i)
 
 			if fType == FieldTypeNonZeroValue {

diff --git a/pkg/cloud/api/type_trait.go b/pkg/cloud/api/type_trait.go
@@ -195,7 +195,8 @@ func (dt *FieldTraits) Clone() *FieldTraits {
 	}
 }
 
-func (dt *FieldTraits) fieldType(p Path) FieldType { return dt.fieldTrait(p).fType }
+// FieldType returns field trait type for a given path
+func (dt *FieldTraits) FieldType(p Path) FieldType { return dt.fieldTrait(p).fType }
 
 func (dt *FieldTraits) fieldTrait(p Path) fieldTrait {
 	// TODO(bowei): this can be made very efficient with a tree, early bailout